www-commits
[Top][All Lists]
Advanced

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

www/philosophy free-sw.lt.html free-sw.pl.html ...


From: GNUN
Subject: www/philosophy free-sw.lt.html free-sw.pl.html ...
Date: Wed, 16 Nov 2016 21:58:11 +0000 (UTC)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/11/16 21:58:10

Modified files:
        philosophy     : free-sw.lt.html free-sw.pl.html free-sw.uk.html 
        philosophy/po  : free-sw.af.po free-sw.ar-diff.html 
                         free-sw.ar.po free-sw.bg.po free-sw.cs.po 
                         free-sw.da.po 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.it.po free-sw.ja.po 
                         free-sw.lt-diff.html free-sw.lt.po 
                         free-sw.nb.po free-sw.nl.po 
                         free-sw.pl-diff.html free-sw.pl.po free-sw.pot 
                         free-sw.pt-br.po free-sw.ro.po free-sw.ru.po 
                         free-sw.sk.po free-sw.sr.po free-sw.sv.po 
                         free-sw.tr.po free-sw.uk-diff.html 
                         free-sw.uk.po free-sw.zh-cn-diff.html 
                         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/free-sw.lt.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.pl.html?cvsroot=www&r1=1.113&r2=1.114
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.uk.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.af.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ar-diff.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ar.po?cvsroot=www&r1=1.80&r2=1.81
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.bg.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.cs.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.da.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.de.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.el.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.es.po?cvsroot=www&r1=1.114&r2=1.115
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.fa.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.fr.po?cvsroot=www&r1=1.117&r2=1.118
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.hr-diff.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.hr.po?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.it.po?cvsroot=www&r1=1.141&r2=1.142
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ja.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.lt-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.lt.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.nb.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.nl.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pl-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pl.po?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pot?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.pt-br.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ro.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ru.po?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sk.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sr.po?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.sv.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.tr.po?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.uk-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.uk.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw-diff.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-tw.po?cvsroot=www&r1=1.35&r2=1.36

Patches:
Index: free-sw.lt.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.lt.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- free-sw.lt.html     19 Oct 2016 14:57:35 -0000      1.9
+++ free-sw.lt.html     16 Nov 2016 21:58:09 -0000      1.10
@@ -3,7 +3,7 @@
  https://www.gnu.org/philosophy/po/free-sw.lt.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html"
  --><!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.lt-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2016-08-20" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2016-08-20" -->
 
 <!--#include virtual="/server/header.lt.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -655,7 +655,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Atnaujinta:
 
-$Date: 2016/10/19 14:57:35 $
+$Date: 2016/11/16 21:58:09 $
 
 <!-- timestamp end -->
 </p>

Index: free-sw.pl.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.pl.html,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- free-sw.pl.html     19 Oct 2016 14:57:35 -0000      1.113
+++ free-sw.pl.html     16 Nov 2016 21:58:09 -0000      1.114
@@ -3,7 +3,7 @@
  https://www.gnu.org/philosophy/po/free-sw.pl.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html"
  --><!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.pl-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2016-08-20" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2016-08-20" -->
 
 <!--#include virtual="/server/header.pl.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -655,7 +655,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2016/10/19 14:57:35 $
+$Date: 2016/11/16 21:58:09 $
 
 <!-- timestamp end -->
 </p>

Index: free-sw.uk.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.uk.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- free-sw.uk.html     19 Oct 2016 14:57:35 -0000      1.22
+++ free-sw.uk.html     16 Nov 2016 21:58:09 -0000      1.23
@@ -3,7 +3,7 @@
  https://www.gnu.org/philosophy/po/free-sw.uk.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/philosophy/free-sw.html"
  --><!--#set var="DIFF_FILE" value="/philosophy/po/free-sw.uk-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2016-08-20" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/free-sw.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2016-08-20" -->
 
 <!--#include virtual="/server/header.uk.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -609,7 +609,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2016/10/19 14:57:35 $
+$Date: 2016/11/16 21:58:09 $
 
 <!-- timestamp end -->
 </p>

Index: po/free-sw.af.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.af.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- po/free-sw.af.po    20 Aug 2016 14:58:39 -0000      1.55
+++ po/free-sw.af.po    16 Nov 2016 21:58:09 -0000      1.56
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2008-02-19 07:45+0200\n"
 "Last-Translator: Renier Maritz <address@hidden>\n"
 "Language-Team: \n"
@@ -99,6 +99,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -166,50 +170,37 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"'n Program is vrye sagteware as gebruikers al hierdie vryhede geniet.  Dus "
-"behoort dit jou vry te staan om kopie&euml; te herversprei, hetsy met of "
-"sonder veranderinge, hetsy gratis of deur 'n verspreidingsfooi te vra, vir "
-"<a href=\"#exportcontrol\">enigeen op enige plek</a>.&nbsp; Om vry te wees "
-"om hierdie dinge te doen beteken (onder andere) dat jy nie vir toestemming "
-"hoef te vra of te betaal nie."
+"<q>Vrye sagteware</q> beteken nie <q>nie-kommersie&euml;l</q> nie.  'n Vrye "
+"program moet beskikbaar wees vir kommersi&euml;le gebruik, -ontwikkeling en -"
+"verspreiding.&nbsp; Kommersi&euml;le ontwikkeling van vrye sagteware is nie "
+"meer ongewoon nie; sulke vryekommersi&euml;le sagteware is baie belangrik."
 
-# type: Content of: <p>
 #. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Jy behoort ook die vryheid te h&ecirc; om veranderinge te maak en hulle vir "
-"privaatdoeleindes te gebruik as jy werk of speel sonder om die bestaan van "
-"sodanige veranderinge hoef bekend te maak.&nbsp; As jy jou veranderinge "
-"publiseer behoort daar nie van jou vereis te word om iemand in besonder "
-"daarvan in kennis te stel nie of op 'n besondere manier daarvan in kennis te "
-"stel nie."
+
+# type: Content of: <ul><li>
+#. type: Content of: <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 ""
+"Die vryheid om die program te hardloop vir enige doeleinde (vryheid 0)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -250,35 +241,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| 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 versions.  (Distributing programs in runnable form is "
-#| "necessary for conveniently installable free operating systems.)  It is ok "
-#| "if there is no way to produce a binary or executable form for a certain "
-#| "program (since some languages don't support that feature), but you must "
-#| "have the freedom to redistribute such forms should you find or develop a "
-#| "way to make them."
-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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Die vryheid om kopie&euml; te herversprei moet bin&ecirc;re of uitvoerbare "
-"vorms van die program, asook die bronkode insluit vir beidie onveranderde en "
-"veranderde weergawes.&nbsp; (Die verspreiding van programme in uitvoerbare "
-"vorm is nodig vir gerief van installasie op vrye bedryfstelsels)&nbsp; Dit "
-"is aanvaarbaar as daar geen manier is om 'n bin&ecirc;re of uitvoerbare vorm "
-"van 'n sekere program te skep nie (aangesien sekere tale hierdie kenmerk nie "
-"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: <p>
 #. type: Content of: <p>
@@ -328,6 +293,63 @@
 "die kopiereg hou op enige kode wat jy byvoeg, dan is die lisensie te "
 "beperkend om te kwalifiseer as vrye sagteware."
 
+#. type: Content of: <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: <ul><li>
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Die vryheid om kopie&euml; te herversprei sodat jy jou naaste kan help "
+"(vryheid 2)."
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"'n Program is vrye sagteware as gebruikers al hierdie vryhede geniet.  Dus "
+"behoort dit jou vry te staan om kopie&euml; te herversprei, hetsy met of "
+"sonder veranderinge, hetsy gratis of deur 'n verspreidingsfooi te vra, vir "
+"<a href=\"#exportcontrol\">enigeen op enige plek</a>.&nbsp; Om vry te wees "
+"om hierdie dinge te doen beteken (onder andere) dat jy nie vir toestemming "
+"hoef te vra of te betaal nie."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Jy behoort ook die vryheid te h&ecirc; om veranderinge te maak en hulle vir "
+"privaatdoeleindes te gebruik as jy werk of speel sonder om die bestaan van "
+"sodanige veranderinge hoef bekend te maak.&nbsp; As jy jou veranderinge "
+"publiseer behoort daar nie van jou vereis te word om iemand in besonder "
+"daarvan in kennis te stel nie of op 'n besondere manier daarvan in kennis te "
+"stel nie."
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -341,17 +363,36 @@
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
+#| 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 versions.  (Distributing programs in runnable form is "
+#| "necessary for conveniently installable free operating systems.)  It is ok "
+#| "if there is no way to produce a binary or executable form for a certain "
+#| "program (since some languages don't support that feature), but you must "
+#| "have the freedom to redistribute such forms should you find or develop a "
+#| "way to make them."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Die vryheid om kopie&euml; te herversprei moet bin&ecirc;re of uitvoerbare "
+"vorms van die program, asook die bronkode insluit vir beidie onveranderde en "
+"veranderde weergawes.&nbsp; (Die verspreiding van programme in uitvoerbare "
+"vorm is nodig vir gerief van installasie op vrye bedryfstelsels)&nbsp; Dit "
+"is aanvaarbaar as daar geen manier is om 'n bin&ecirc;re of uitvoerbare vorm "
+"van 'n sekere program te skep nie (aangesien sekere tale hierdie kenmerk nie "
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Vir hierdie vryhede om verwesenlik te word moet hulle onherroeplik wees "
-"solank as wat jy niks verkeerd gedoen het nie; as die ontwikkelaar van die "
-"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: <p>
 #. type: Content of: <p>
@@ -364,12 +405,12 @@
 #| "other people the central freedoms.  This rule does not conflict with the "
 #| "central freedoms; rather it protects them."
 msgid ""
-"However, 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."
+"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."
 msgstr ""
 "Sommige re&euml;ls oor die manier waarop vrye sagteware versprei moet word "
 "is aanvaarbaar, as hulle nie met die kernvryhede inmeng nie.  Kopielinks, "
@@ -400,43 +441,20 @@
 "kopielinks te gebruik</a>, maar as jou program nie-kopielinkse vrye "
 "sagteware bevat kan dit steeds aanvaarbaar geag word. "
 
-# type: Content of: <p>
-#. type: Content of: <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>."
-msgstr ""
-"<q>Vrye sagteware</q> beteken nie <q>nie-kommersie&euml;l</q> nie.  'n Vrye "
-"program moet beskikbaar wees vir kommersi&euml;le gebruik, -ontwikkeling en -"
-"verspreiding.&nbsp; Kommersi&euml;le ontwikkeling van vrye sagteware is nie "
-"meer ongewoon nie; sulke vryekommersi&euml;le sagteware is baie belangrik."
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 
 # type: Content of: <p>
@@ -462,6 +480,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -494,6 +516,25 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+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 "
+"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."
+msgstr ""
+"Vir hierdie vryhede om verwesenlik te word moet hulle onherroeplik wees "
+"solank as wat jy niks verkeerd gedoen het nie; as die ontwikkelaar van die "
+"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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -509,6 +550,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -561,6 +606,10 @@
 "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: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -593,6 +642,10 @@
 "\"http://www.gnu.org/philosophy/fs-translations.html\";>vertalings van vry "
 "sagteware</a> in verskeie tale."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -622,6 +675,10 @@
 "andere te maak om te sien waarom sekere lisensies as vryesagteware "
 "kwalifiseer aldan nie."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.ar-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ar-diff.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- po/free-sw.ar-diff.html     20 Aug 2016 14:58:39 -0000      1.36
+++ po/free-sw.ar-diff.html     16 Nov 2016 21:58:09 -0000      1.37
@@ -24,10 +24,10 @@
 &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="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 
 &lt;h3&gt;The Free Software Definition&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 &lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
@@ -74,6 +74,8 @@
 in &ldquo;free speech,&rdquo; not as in &ldquo;free 
beer&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>power&lt;/a&gt;.</em></ins></span>
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt; The four essential 
freedoms&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
 A program is free software if the program's users have the
 four essential freedoms:
@@ -99,36 +101,45 @@
 &lt;p&gt;
 A program is free software if <span class="inserted"><ins><em>it 
gives</em></ins></span> users <span 
class="removed"><del><strong>have</strong></del></span> <span 
class="inserted"><ins><em>adequately</em></ins></span> all of these
 freedoms.  <span class="removed"><del><strong>Thus,
-you should</strong></del></span>  <span class="inserted"><ins><em>Otherwise, 
it is nonfree.  While we can distinguish various
+you should be free</strong></del></span>  <span 
class="inserted"><ins><em>Otherwise, it is nonfree.  While we can distinguish 
various
 nonfree distribution schemes in terms of how far they fall short of
 being free, we consider them all equally unethical.&lt;/p&gt;
 
-&lt;p&gt;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.  If we plan to distribute A as it stands, that
-implies users will need B, so we need to judge whether both A and B
-are free.  However, if we plan to modify A so that it doesn't use B,
-only A needs to</em></ins></span> be <span class="inserted"><ins><em>free; B 
is not pertinent to that plan.&lt;/p&gt;
-
-&lt;p&gt;The rest of this page clarifies certain points about what makes
-specific freedoms adequate or not.&lt;/p&gt;
-
-&lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you 
are</em></ins></span> free to
-redistribute copies, either with or without modifications, either
-gratis or charging a fee for distribution, to
-&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
-things means (among other things) that you do not have to ask or pay
+&lt;p&gt;In any given scenario, these freedoms must apply</em></ins></span> to 
<span class="removed"><del><strong>redistribute copies, either with or without
+modifications, either gratis</strong></del></span> <span 
class="inserted"><ins><em>whatever code
+we plan to make use of,</em></ins></span> or <span 
class="removed"><del><strong>charging</strong></del></span> <span 
class="inserted"><ins><em>lead others to make use of.  For instance,
+consider</em></ins></span> a <span class="removed"><del><strong>fee for 
distribution,</strong></del></span> <span class="inserted"><ins><em>program A 
which automatically launches a program B</em></ins></span> to
+<span class="removed"><del><strong>&lt;a href="#exportcontrol"&gt;anyone 
anywhere&lt;/a&gt;.  Being free</strong></del></span>
+<span class="inserted"><ins><em>handle some cases.  If we 
plan</em></ins></span> to <span class="removed"><del><strong>do these
+things means (among other things)</strong></del></span> <span 
class="inserted"><ins><em>distribute A as it stands,</em></ins></span> that 
<span class="removed"><del><strong>you do not have to ask or pay
 for permission to do so.
 &lt;/p&gt;
 
 &lt;p&gt;
-You should also have the freedom to make modifications and use them
-privately in your own work or play, without even mentioning that they
-exist.  If you do publish your changes, you should not be required to
-notify anyone in particular, or in any particular way.
+You should also have the freedom</strong></del></span>
+<span class="inserted"><ins><em>implies users will need B, so we 
need</em></ins></span> to <span class="removed"><del><strong>make 
modifications</strong></del></span> <span class="inserted"><ins><em>judge 
whether both A</em></ins></span> and <span class="inserted"><ins><em>B
+are free.  However, if we plan to modify A so that it 
doesn't</em></ins></span> use <span class="removed"><del><strong>them
+privately in your own work or play, without even 
mentioning</strong></del></span> <span class="inserted"><ins><em>B,
+only A needs to be free; B is not pertinent to</em></ins></span> that <span 
class="removed"><del><strong>they
+exist.  If you do publish your changes, you should</strong></del></span> <span 
class="inserted"><ins><em>plan.&lt;/p&gt;
+
+&lt;p&gt;
+&ldquo;Free software&rdquo; does</em></ins></span> not <span 
class="inserted"><ins><em>mean &ldquo;noncommercial&rdquo;.  A free
+program must</em></ins></span> be <span 
class="removed"><del><strong>required</strong></del></span> <span 
class="inserted"><ins><em>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</em></ins></span> to
+<span class="removed"><del><strong>notify anyone in 
particular,</strong></del></span> <span class="inserted"><ins><em>get copies of 
free software,</em></ins></span> or <span class="removed"><del><strong>in any 
particular way.</strong></del></span> <span class="inserted"><ins><em>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;.</em></ins></span>
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;The rest of this page clarifies 
certain points about what makes
+specific freedoms adequate or not.&lt;/p&gt;
+
+&lt;h4&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
 or organization to use it on any kind of computer system, for any kind of
@@ -141,21 +152,19 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-The freedom to <span class="inserted"><ins><em>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 to do.&lt;/p&gt;
-
-&lt;p&gt;
-The freedom to</em></ins></span> redistribute copies must include binary or 
executable
-forms of the program, as well as source code, for both modified and
+The freedom to <span class="removed"><del><strong>redistribute copies must 
include binary or executable
+forms of</strong></del></span> <span 
class="inserted"><ins><em>run</em></ins></span> the <span 
class="removed"><del><strong>program, as well</strong></del></span> <span 
class="inserted"><ins><em>program</em></ins></span> as <span 
class="removed"><del><strong>source code, for both modified and
 unmodified versions.  (Distributing programs in runnable form is necessary
-for conveniently installable free operating systems.)  It is OK if there
-is no way to produce a binary or executable form for a certain program
-(since some languages don't support that feature), but you must have the
-freedom to redistribute such forms should you find or develop a way to
-make them.
-&lt;/p&gt;
+for conveniently installable free operating systems.)</strong></del></span> 
<span class="inserted"><ins><em>you wish means that you are not
+forbidden or stopped from doing so.</em></ins></span>  It <span 
class="removed"><del><strong>is OK if there
+is no way</strong></del></span> <span class="inserted"><ins><em>has 
nothing</em></ins></span> to <span class="removed"><del><strong>produce a 
binary</strong></del></span> <span class="inserted"><ins><em>do with what
+functionality the program has,</em></ins></span> or <span 
class="removed"><del><strong>executable form</strong></del></span> <span 
class="inserted"><ins><em>whether it is useful</em></ins></span> for <span 
class="removed"><del><strong>a certain program
+(since some languages don't support that feature), but</strong></del></span> 
<span class="inserted"><ins><em>what</em></ins></span> you <span 
class="removed"><del><strong>must have the
+freedom</strong></del></span>
+<span class="inserted"><ins><em>want</em></ins></span> to <span 
class="removed"><del><strong>redistribute such forms should you find or develop 
a way</strong></del></span> <span class="inserted"><ins><em>do.&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;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>changes&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -187,8 +196,33 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="removed"><del><strong>Freedom 3 includes the freedom to release 
your modified versions
+as free</strong></del></span>
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;h4&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
+gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist.  If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+&lt;/p&gt;
+
+&lt;p&gt;
 Freedom 3 includes the freedom to release your modified versions
-as free software.  A free license may also permit other ways of
+as free</em></ins></span> 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
 license that requires modified versions to be nonfree does not qualify
@@ -196,55 +230,69 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-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
-restrictions to its terms, without your doing anything wrong to give
-cause, the software is not free.
+<span class="removed"><del><strong>In order for these 
freedoms</strong></del></span>
+<span class="inserted"><ins><em>The freedom</em></ins></span> to <span 
class="removed"><del><strong>be real, they</strong></del></span> <span 
class="inserted"><ins><em>redistribute copies</em></ins></span> must <span 
class="removed"><del><strong>be permanent and
+irrevocable</strong></del></span> <span class="inserted"><ins><em>include 
binary or executable
+forms of the program,</em></ins></span> as <span 
class="removed"><del><strong>long</strong></del></span> <span 
class="inserted"><ins><em>well</em></ins></span> as <span 
class="removed"><del><strong>you do nothing wrong;</strong></del></span> <span 
class="inserted"><ins><em>source code, for both modified and
+unmodified versions.  (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.)  It is 
OK</em></ins></span> if <span class="removed"><del><strong>the developer of the
+software has the power</strong></del></span> <span 
class="inserted"><ins><em>there
+is no way</em></ins></span> to <span class="removed"><del><strong>revoke the 
license,</strong></del></span> <span class="inserted"><ins><em>produce a 
binary</em></ins></span> or <span class="removed"><del><strong>retroactively add
+restrictions</strong></del></span> <span class="inserted"><ins><em>executable 
form for a certain program
+(since some languages don't support that feature), but you must have the
+freedom</em></ins></span> to <span class="removed"><del><strong>its terms, 
without your doing anything wrong</strong></del></span> <span 
class="inserted"><ins><em>redistribute such forms should you find or develop a 
way</em></ins></span> to <span class="removed"><del><strong>give
+cause, the software is not free.</strong></del></span>
+<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>
+
 &lt;p&gt;
-However, certain kinds of rules about the manner of distributing free
+<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>
-(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.
+(very simply stated) is the rule that
+<span class="removed"><del><strong>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.
 &lt;/p&gt;
 
 &lt;p&gt;
-<span class="inserted"><ins><em>In the GNU project, we use copyleft to protect 
the four freedoms
-legally for everyone.  We believe there are important reasons why
-&lt;a href="/philosophy/pragmatic.html"&gt;it is better to use
-copyleft&lt;/a&gt;.  However,
-&lt;a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;
-noncopylefted free software&lt;/a&gt; is ethical
-too.  See &lt;a href="/philosophy/categories.html"&gt;Categories of Free
-Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo;
-&ldquo;copylefted software&rdquo; and other categories of software
-relate to each other.
-&lt;/p&gt;
-
-&lt;p&gt;</em></ins></span>
 &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 
-&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+you always have</strong></del></span> <span class="inserted"><ins><em>when 
redistributing</em></ins></span> the <span 
class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>program,
+you cannot add restrictions</em></ins></span> to <span 
class="removed"><del><strong>copy and change</strong></del></span> <span 
class="inserted"><ins><em>deny other people</em></ins></span> the <span 
class="removed"><del><strong>software, even to 
+&lt;a href="/philosophy/selling.html"&gt;sell 
copies&lt;/a&gt;.</strong></del></span> <span class="inserted"><ins><em>central 
freedoms.
+This rule does not conflict with the central freedoms; rather it
+protects them.</em></ins></span>
 &lt;/p&gt;
 
 &lt;p&gt;
-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.
+<span class="removed"><del><strong>Whether a change constitutes an improvement 
is a subjective matter.
+If your right</strong></del></span>
+<span class="inserted"><ins><em>In the GNU project, we use 
copyleft</em></ins></span> to <span class="removed"><del><strong>modify a 
program</strong></del></span> <span class="inserted"><ins><em>protect the four 
freedoms
+legally for everyone.  We believe there are important reasons why
+&lt;a href="/philosophy/pragmatic.html"&gt;it</em></ins></span> is <span 
class="removed"><del><strong>limited, in substance,</strong></del></span> <span 
class="inserted"><ins><em>better</em></ins></span> to <span 
class="removed"><del><strong>changes that
+someone else considers an improvement, that program</strong></del></span> 
<span class="inserted"><ins><em>use
+copyleft&lt;/a&gt;.  However,
+&lt;a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;
+noncopylefted free software&lt;/a&gt;</em></ins></span> is <span 
class="removed"><del><strong>not free.</strong></del></span> <span 
class="inserted"><ins><em>ethical
+too.  See &lt;a href="/philosophy/categories.html"&gt;Categories of Free
+Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo;
+&ldquo;copylefted software&rdquo; and other categories of software
+relate to each other.</em></ins></span>
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt;Rules about packaging and 
distribution details&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
-However, rules about how to package a modified version are acceptable,
+<span class="removed"><del><strong>However, rules</strong></del></span>
+<span class="inserted"><ins><em>Rules</em></ins></span> 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 privately.
 Thus, it is acceptable for the license to require that you change the
@@ -252,20 +300,19 @@
 modifications as yours.  As long as these requirements are not so
 burdensome that they effectively hamper you from releasing your
 changes, they are acceptable; you're already making other changes to
-the program, so you <span class="removed"><del><strong>won't have trouble 
making a few more.
+the program, so you won't have trouble making a few more.
 &lt;/p&gt;
 
 &lt;p&gt;
-A special issue arises when a license requires changing the name by
+<span class="removed"><del><strong>A special issue arises when a license 
requires changing the name by
 which the program will be invoked from other programs.  That
 effectively hampers you from releasing your changed version so that it
 can replace the original when invoked by those other programs.  This
 sort of requirement is acceptable only if there's a suitable aliasing
 facility that allows you to specify the original program's name as an
-alias for the modified version.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>won't have trouble making a few more.
-&lt;/p&gt;</em></ins></span>
+alias for the modified version.&lt;/p&gt;
 
-&lt;p&gt;
+&lt;p&gt;</strong></del></span>
 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 condition.  An example of such an acceptable rule is one
@@ -279,21 +326,23 @@
 
 &lt;p&gt;
 <span class="removed"><del><strong>In</strong></del></span>
-<span class="inserted"><ins><em>A special issue arises when a license requires 
changing the name by
-which</em></ins></span> the <span class="removed"><del><strong>GNU project, we 
use 
+<span class="inserted"><ins><em>A special issue arises when a license requires 
changing</em></ins></span> the <span class="removed"><del><strong>GNU project, 
we use 
 &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
 to protect these freedoms legally for everyone.  But 
 &lt;a 
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;noncopylefted
 free software&lt;/a&gt; also exists.  We believe there are important reasons 
why
 &lt;a href="/philosophy/pragmatic.html"&gt;it is better to use 
copyleft&lt;/a&gt;,
-but if your</strong></del></span> program <span 
class="removed"><del><strong>is noncopylefted free 
software,</strong></del></span> <span class="inserted"><ins><em>will be invoked 
from other programs.  That
-effectively hampers you from releasing your changed version so 
that</em></ins></span> it <span class="removed"><del><strong>is still basically
+but if</strong></del></span> <span class="inserted"><ins><em>name by
+which the program will be invoked from other programs.  That
+effectively hampers you from releasing</em></ins></span> your <span 
class="removed"><del><strong>program is noncopylefted free 
software,</strong></del></span> <span class="inserted"><ins><em>changed version 
so that</em></ins></span> it <span class="removed"><del><strong>is still 
basically
 ethical. (See &lt;a href="/philosophy/categories.html"&gt;Categories of Free 
Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo; 
&ldquo;copylefted software&rdquo; and</strong></del></span>
 <span class="inserted"><ins><em>can replace the original when invoked by 
those</em></ins></span> other <span 
class="removed"><del><strong>categories</strong></del></span> <span 
class="inserted"><ins><em>programs.  This
 sort</em></ins></span> of <span class="removed"><del><strong>software 
relate</strong></del></span> <span class="inserted"><ins><em>requirement is 
acceptable only if there's a suitable aliasing
 facility that allows you</em></ins></span> to <span 
class="removed"><del><strong>each other.)
 &lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>specify the 
original program's name as an
-alias for the modified version.&lt;/p&gt;</em></ins></span>
+alias for the modified version.&lt;/p&gt;
+
+&lt;h4&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;
@@ -317,6 +366,16 @@
 software nonfree.
 &lt;/p&gt;
 
+&lt;h4&gt;Legal considerations&lt;/h4&gt;
+
+&lt;p&gt;
+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
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+&lt;/p&gt;
+
 &lt;p&gt;
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -331,6 +390,8 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
+&lt;h4&gt;Contract-based licenses&lt;/h4&gt;
+
 &lt;p&gt;</em></ins></span>
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -350,6 +411,8 @@
 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;
 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
@@ -361,6 +424,8 @@
 &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;
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -375,6 +440,8 @@
 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>
+
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
 software license, see our &lt;a href="/licenses/license-list.html"&gt;list
@@ -635,7 +702,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2016/08/20 14:58:39 $
+$Date: 2016/11/16 21:58:09 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/free-sw.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ar.po,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- po/free-sw.ar.po    20 Aug 2016 14:58:39 -0000      1.80
+++ po/free-sw.ar.po    16 Nov 2016 21:58:09 -0000      1.81
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2013-01-14 16:32+0200\n"
 "Last-Translator: Rafik E. Younan <address@hidden>\n"
 "Language-Team: Arabic <address@hidden>\n"
@@ -117,6 +117,10 @@
 "بالبرنامج، ويتحكم بالمستخدمين من خلاله. 
بالتالي، يكون هذا البرنامج غير الحر "
 "أو &rdquo;الإحتكاري&ldquo; أداة تعطي سلطة غير 
عادلة."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -178,46 +182,38 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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 to do so."
 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 "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"يكون البرنامج حرًا إذا امتلك مستخدموه جم
يع هذه الحريات. لذلك، ينبغي أن تكون "
-"حرًا في إعادة توزيع نُسخ من البرنامج <a 
href=\"#exportcontrol\">لأي شخص في أي "
-"مكان</a>، سواءً كانت معدّلة أم لم تكن، 
وسواءً تم ذلك مجانًا أو مقابل رسوم مادية. "
-"أن تكون حرًا في فعل هذه الأشياء يعني (من ضم
ن ما يعنيه) أنك غير مضطر لطلب "
-"الإذن أو أن تدفع للحصول على إذن لعمل ذلك."
+"&rdquo;البرمجيات الحرة&ldquo; لا تعني &rdquo;البرم
جيات غير التجارية&ldquo;. "
+"يجب أن يكون البرنامج الحر متاحاً للاستخدام
 التجاري والتطوير التجاري والتوزيع "
+"التجاري. لم يعد التطوير التجاري للبرمجيات 
الحرة غريباً؛ بل إن مثل هذه "
+"البرمجيات الحرة التجارية مهمة جداً. ربما 
دفعت مالاً للحصول على نسخ من برمجيات "
+"حرة، أو ربما حصلت على نسخ بدون مقابل. لكن 
بغض النظر عن كيفية حصولك على "
+"النسخ، لديك دائماً حرية نسخ وتعديل البرم
جيات، بل حتى <a href=\"/philosophy/"
+"selling.html\">بيع نسخ منها</a>."
 
-# type: Content of: <p>
 #. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"ينبغي أيضًا أن تملك حرية إنشاء تعديلات 
واستخدامها بشكل خاص في عملك أو تسليتك، "
-"بدون الإشارة حتى إلى وجودها. إذا نشرت 
تعديلاتك، يجب ألا تُطالب بإخطار أي شخص "
-"محدد، بأي طريقة محددة."
+
+# type: Content of: <ul><li>
+#. type: Content of: <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 "حرية تشغيل البرنامج، لأي غرض كان 
(الحرية 0)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -245,23 +241,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"حرية إعادة توزيع النسخ يجب أن تتضمن 
الهيئتين الثنائية أو التنفيذية للبرنامج، "
-"بالإضافة إلى الشفرة المصدرية، لكلا 
الإصدارين المعدل وغير المعدل. (توزيع "
-"البرنامج بصيغة قابلة للتشغيل ضروري لتوزيع 
أنظمة تشغيل حرة يمكن تثبيتها "
-"بسهولة.) لا مشكلة إذا لم توجد طريقة لتوليد 
هيئة ثنائية أو تنفيذية لبرنامج "
-"معين (لأن بعض لغات البرمجة لا تدعم هذه الم
يزة)، لكن يجب أن تمتلك حرية إعادة "
-"توزيع هذه الهيئات في حال وجدتها أو طورت 
طريقة للحصول عليها."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -325,6 +307,61 @@
 # type: Content of: <p>
 #. type: Content of: <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: <ul><li>
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr "حرية إعادة توزيع نسخ من البرنامج لتتم
كن من مساعدة جارك (الحرية 2)."
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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 to do so."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"يكون البرنامج حرًا إذا امتلك مستخدموه جم
يع هذه الحريات. لذلك، ينبغي أن تكون "
+"حرًا في إعادة توزيع نُسخ من البرنامج <a 
href=\"#exportcontrol\">لأي شخص في أي "
+"مكان</a>، سواءً كانت معدّلة أم لم تكن، 
وسواءً تم ذلك مجانًا أو مقابل رسوم مادية. "
+"أن تكون حرًا في فعل هذه الأشياء يعني (من ضم
ن ما يعنيه) أنك غير مضطر لطلب "
+"الإذن أو أن تدفع للحصول على إذن لعمل ذلك."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"ينبغي أيضًا أن تملك حرية إنشاء تعديلات 
واستخدامها بشكل خاص في عملك أو تسليتك، "
+"بدون الإشارة حتى إلى وجودها. إذا نشرت 
تعديلاتك، يجب ألا تُطالب بإخطار أي شخص "
+"محدد، بأي طريقة محددة."
+
+# type: Content of: <p>
+#. type: Content of: <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"
@@ -339,26 +376,43 @@
 # type: Content of: <p>
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"حرية إعادة توزيع النسخ يجب أن تتضمن 
الهيئتين الثنائية أو التنفيذية للبرنامج، "
+"بالإضافة إلى الشفرة المصدرية، لكلا 
الإصدارين المعدل وغير المعدل. (توزيع "
+"البرنامج بصيغة قابلة للتشغيل ضروري لتوزيع 
أنظمة تشغيل حرة يمكن تثبيتها "
+"بسهولة.) لا مشكلة إذا لم توجد طريقة لتوليد 
هيئة ثنائية أو تنفيذية لبرنامج "
+"معين (لأن بعض لغات البرمجة لا تدعم هذه الم
يزة)، لكن يجب أن تمتلك حرية إعادة "
+"توزيع هذه الهيئات في حال وجدتها أو طورت 
طريقة للحصول عليها."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"حتى تكون هذه الحريات حقيقية، يجب أن تكون 
دائمة وغير قابلة للإلغاء طالما أنك "
-"لم ترتكب أي خطأ؛ إذا كان لدى مطور البرم
جيات القدرة على إبطال الرخصة، أو "
-"إضافة قيود إلى شروطها بشكل رجعي بدون أن 
ترتكب أي خطأ يدعو لذلك، يكون "
-"البرنامج غير حر."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "من ناحية أخرى، توجد أنواع معينة مقبولة من 
القواعد المتعلقة بتوزيع البرمجيات "
 "الحرة، عندما لا تتعارض مع الحريات الم
ركزية. على سبيل المثال، <a href=\"/"
@@ -399,49 +453,32 @@
 "العلاقة بين &rdquo;البرمجيات الحرة&ldquo;، 
و&rdquo;البرمجيات ذات الحقوق "
 "المتروكة&ldquo; والأنواع الأخرى من البرم
جيات.)"
 
-# type: Content of: <p>
-#. type: Content of: <p>
-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>."
-msgstr ""
-"&rdquo;البرمجيات الحرة&ldquo; لا تعني &rdquo;البرم
جيات غير التجارية&ldquo;. "
-"يجب أن يكون البرنامج الحر متاحاً للاستخدام
 التجاري والتطوير التجاري والتوزيع "
-"التجاري. لم يعد التطوير التجاري للبرمجيات 
الحرة غريباً؛ بل إن مثل هذه "
-"البرمجيات الحرة التجارية مهمة جداً. ربما 
دفعت مالاً للحصول على نسخ من برمجيات "
-"حرة، أو ربما حصلت على نسخ بدون مقابل. لكن 
بغض النظر عن كيفية حصولك على "
-"النسخ، لديك دائماً حرية نسخ وتعديل البرم
جيات، بل حتى <a href=\"/philosophy/"
-"selling.html\">بيع نسخ منها</a>."
-
-# type: Content of: <p>
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"إن اعتبار أن تعديلًا ما للبرنامج يشكل 
تحسينًا هو مسألة شخصية. إذا كان حقك في "
-"تعديل البرنامج محدود، عمليًا، بالتعديلات 
التي يعتبرها شخص آخر تحسينات على "
-"البرنامج، فهذا البرنامج ليس حر."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "ومع ذلك، فإن القواعد المتعلقة بكيفية تحزيم
 النسخة المعدّلة مقبولة، إذا لم "
 "تقيد حريتك في إصدار نسخ معدلة من الناحية 
العملية، أو حريتك في إنشاء واستخدام "
@@ -485,6 +522,10 @@
 "فقط في حال وجود وسيلة تسمية متعددة مناسبة 
تسمح لك بتعيين اسم البرنامج الأصلي "
 "كاسم ثان للنسخة المعدلة."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -526,6 +567,24 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"حتى تكون هذه الحريات حقيقية، يجب أن تكون 
دائمة وغير قابلة للإلغاء طالما أنك "
+"لم ترتكب أي خطأ؛ إذا كان لدى مطور البرم
جيات القدرة على إبطال الرخصة، أو "
+"إضافة قيود إلى شروطها بشكل رجعي بدون أن 
ترتكب أي خطأ يدعو لذلك، يكون "
+"البرنامج غير حر."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -541,6 +600,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -573,6 +636,10 @@
 "يقيد المستخدم بشكل غريب لا تستطيع 
التراخيص المبنية على حقوق النشر فعله، وغير "
 "مذكور بين القواعد المشروعة هنا، يجب أن 
ندرسه، والأرجح أننا سنعتبره غير حر."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -593,6 +660,10 @@
 "قائمة <a href=\"/philosophy/fs-translations.html\"> بترجمات 
&rdquo;البرمجيات "
 "الحرة&ldquo;</a> الملائمة إلى لغات عديدة."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -617,6 +688,10 @@
 "إذا كان ذاك المطلب مقبولًا. عندما نصل إلى 
نتيجة بخصوص قضية جديدة، عادة ما "
 "نحدّث هذه المعايير لتسهيل فهم سبب مطابقة 
أو عدم مطابقة رخصة معينة للمعايير."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.bg.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- po/free-sw.bg.po    20 Aug 2016 14:58:39 -0000      1.57
+++ po/free-sw.bg.po    16 Nov 2016 21:58:09 -0000      1.58
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2008-03-21 13:34+0200\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -107,6 +107,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -188,49 +192,42 @@
 "that plan."
 msgstr ""
 
+# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
+"„Свободен“ за софтуер не означава 
„некомерсиален“.  Една свободна програма "
+"трябва да е достъпна за комерсиално 
ползване, комерсиална разработка и "
+"комерсиално разпространение.  
Комерсиалната разработка на свободен 
софтуер "
+"вече не е нещо необичайно.  Този свободен, 
комерсиален софтуер е много "
+"важен. Може да сте платили пари, за да се 
сдобиете с копие на свободен "
+"софтуер, може да сте го получили 
безплатно.  Независимо от начина, по който "
+"сте придобили копията си, вие винаги сте 
свободни да копирате и променяте "
+"софтуера, дори да <a 
href=\"/philosophy/selling.html\">продавате копия</a>."
 
-# type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Една програма е свободен софтуер, ако 
потребителите имат всичките четири "
-"свободи.  По такъв начин, вие трябва да сте 
свободни да разпространявате "
-"копия, идентични с оригинала или 
променени, безплатно или срещу заплащане <a "
-"href=\"#exportcontrol\">на всеки и навсякъде</a>.  
Освен всичко друго, това, "
-"че програмата е свободна, означава, че не 
трябва да се молите или да "
-"плащате, за да упражните тези свободи."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+# type: Content of: <ul><li>
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Също така, вие трябва да разполагате със 
свободата да правите промени и да "
-"ги ползвате самостоятелно в работата си 
или ако просто си играете, без дори "
-"да споменавате за тяхното съществуване.  
Ако публикувате промените си, от "
-"вас не трябва да се изисква да уведомявате 
някого за това по какъвто и да е "
-"начин."
+"Свободата да изпълняваш програмата както 
желаете — за всякакви цели (свобода "
+"№0)<sup><a href=\"#TransNote2\">2</a></sup>."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -260,26 +257,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Свободата да разпространяваш копия 
трябва да се отнася както за двоичните "
-"или изпълнимите форми на програмата, така 
и за формите в изходен код, както "
-"за оригиналните, така и за променените 
версии.  (Разпространението на "
-"програми в изпълнима форма е необходимо 
за удобно инсталиране на свободни "
-"операционни системи.)  Нормално е за някои 
програми да няма начин за "
-"създаването на представяне в двоичен или 
изпълним вид (понеже някои езици не "
-"поддържат тази възможност), но вие трябва 
да имате свободата да "
-"разпространявате такива форми, ако 
намерите или изобретите начин да ги "
-"създавате."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -335,6 +315,61 @@
 "вие да сте носителят на авторските права 
на всеки код, който добавяте, то "
 "лицензът е прекалено ограничаващ, за да 
бъде наречен свободен."
 
+#. type: Content of: <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: <ul><li>
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Свободата да разпространяваш копия, за да 
помагаш на ближния си (свобода №2)."
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Една програма е свободен софтуер, ако 
потребителите имат всичките четири "
+"свободи.  По такъв начин, вие трябва да сте 
свободни да разпространявате "
+"копия, идентични с оригинала или 
променени, безплатно или срещу заплащане <a "
+"href=\"#exportcontrol\">на всеки и навсякъде</a>.  
Освен всичко друго, това, "
+"че програмата е свободна, означава, че не 
трябва да се молите или да "
+"плащате, за да упражните тези свободи."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Също така, вие трябва да разполагате със 
свободата да правите промени и да "
+"ги ползвате самостоятелно в работата си 
или ако просто си играете, без дори "
+"да споменавате за тяхното съществуване.  
Ако публикувате промените си, от "
+"вас не трябва да се изисква да уведомявате 
някого за това по какъвто и да е "
+"начин."
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -347,33 +382,47 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, without your doing anything to give cause, the "
-#| "software is not free."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Свободата да разпространяваш копия 
трябва да се отнася както за двоичните "
+"или изпълнимите форми на програмата, така 
и за формите в изходен код, както "
+"за оригиналните, така и за променените 
версии.  (Разпространението на "
+"програми в изпълнима форма е необходимо 
за удобно инсталиране на свободни "
+"операционни системи.)  Нормално е за някои 
програми да няма начин за "
+"създаването на представяне в двоичен или 
изпълним вид (понеже някои езици не "
+"поддържат тази възможност), но вие трябва 
да имате свободата да "
+"разпространявате такива форми, ако 
намерите или изобретите начин да ги "
+"създавате."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"За да бъдат тези свободи реални, се 
изисква те да са неотменими, стига вие "
-"да не сте направили нищо лошо.  Ако 
разработчикът на софтуера има властта да "
-"отмени лиценза, без вие да сте направили 
нищо, за да предизвикате това, то "
-"софтуерът не е свободен."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Все пак, някои правила за начина на 
разпространение на свободния софтуер са "
 "приемливи, когато не противоречат на 
основните свободи.  Например „<a href="
@@ -417,32 +466,8 @@
 "софтуер“, „софтуер със защита copyleft“ и 
другите видове се съотнасят един с "
 "друг."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-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>."
-msgstr ""
-"„Свободен“ за софтуер не означава 
„некомерсиален“.  Една свободна програма "
-"трябва да е достъпна за комерсиално 
ползване, комерсиална разработка и "
-"комерсиално разпространение.  
Комерсиалната разработка на свободен 
софтуер "
-"вече не е нещо необичайно.  Този свободен, 
комерсиален софтуер е много "
-"важен. Може да сте платили пари, за да се 
сдобиете с копие на свободен "
-"софтуер, може да сте го получили 
безплатно.  Независимо от начина, по който "
-"сте придобили копията си, вие винаги сте 
свободни да копирате и променяте "
-"софтуера, дори да <a 
href=\"/philosophy/selling.html\">продавате копия</a>."
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 # type: Content of: <p>
@@ -462,15 +487,14 @@
 #| "modified version and a previous developer asks for a copy of it, you must "
 #| "send one."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Правила за начина на пакетиране на 
променена версия са приемливи, стига по "
 "същество да не пречат на свободата ви да я 
разпространявате или да "
@@ -507,6 +531,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -547,6 +575,30 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, without your doing anything to give cause, the "
+#| "software is not free."
+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 "
+"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."
+msgstr ""
+"За да бъдат тези свободи реални, се 
изисква те да са неотменими, стига вие "
+"да не сте направили нищо лошо.  Ако 
разработчикът на софтуера има властта да "
+"отмени лиценза, без вие да сте направили 
нищо, за да предизвикате това, то "
+"софтуерът не е свободен."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -562,6 +614,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -600,6 +656,10 @@
 "трябва да помислим върху него и е вероятно 
да заключим, че лицензът не е "
 "свободен."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -621,6 +681,10 @@
 "списък с <a 
href=\"/philosophy/fs-translations.html\">преводите на 
„свободен "
 "софтуер“</a> на различни езици."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -649,6 +713,10 @@
 "често обновяваме горните критерии, за да 
бъде по-ясно защо определени "
 "лицензи се определят или не като свободни."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.cs.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.cs.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/free-sw.cs.po    20 Aug 2016 14:58:39 -0000      1.8
+++ po/free-sw.cs.po    16 Nov 2016 21:58:09 -0000      1.9
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2014-12-11 21:15+0100\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -96,6 +96,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -170,44 +174,45 @@
 msgstr ""
 
 #. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "A program is free software if users have all of these freedoms. Thus, you "
-#| "should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
+#| "``Free software'' does not mean ``non-commercial''.  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 ""
-"Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
-"copies, either with or without modifications, either gratis or charging a "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"Program je svobodným software, pokud uživatelé mají všechny tyto 
svobody. "
-"Měli byste moct redistribuovat kopie, buď modifikované či nikoliv, 
zadarmo "
-"nebo s poplatkem za distribuci <a href=\"#exportcontrol\">komukoliv "
-"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."
+"„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: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Mělo by vám být rovněž umožněno modifikovat jej a používat tuto "
-"modifikovanou verzi soukromě ve vašem zaměstnání nebo volném čase, bez 
toho "
-"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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
+msgstr "Svoboda spustit program za jakýmkoliv účelem (svoboda 0)."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -238,28 +243,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <p>
-#, fuzzy
-#| 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 versions.  It is ok if there is no way to produce a binary or "
-#| "executable form, but people must have the freedom to redistribute such "
-#| "forms should they find a way to make them."
-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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Svoboda redistribuovat kopie musí zahrnovat binární i spustitelné podoby "
-"programu, stejně jako zdrojový kód pro jak modifikované, tak 
nemodifikované "
-"verze. Je v pořádku, není-li možné vytvořit binární nebo spustitelnou 
formu, "
-"lidé ale musí mít svobodu redistribuuovat takové podoby programu, aby 
měli "
-"způsob, jak je vytvořit."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -302,6 +288,56 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Svoboda redistribuovat kopie, abyste pomohli vašemu kolegovi (svoboda 2)."
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms. Thus, you "
+#| "should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Program je svobodným software, pokud uživatelé mají všechny tyto 
svobody. "
+"Měli byste moct redistribuovat kopie, buď modifikované či nikoliv, 
zadarmo "
+"nebo s poplatkem za distribuci <a href=\"#exportcontrol\">komukoliv "
+"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: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Mělo by vám být rovněž umožněno modifikovat jej a používat tuto "
+"modifikovanou verzi soukromě ve vašem zaměstnání nebo volném čase, bez 
toho "
+"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: <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"
@@ -312,30 +348,47 @@
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, without your doing anything to give cause, the "
-#| "software is not free."
+#| "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.  It is ok if there is no way to produce a binary or "
+#| "executable form, but people must have the freedom to redistribute such "
+#| "forms should they find a way to make them."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Svoboda redistribuovat kopie musí zahrnovat binární i spustitelné podoby "
+"programu, stejně jako zdrojový kód pro jak modifikované, tak 
nemodifikované "
+"verze. Je v pořádku, není-li možné vytvořit binární nebo spustitelnou 
formu, "
+"lidé ale musí mít svobodu redistribuuovat takové podoby programu, aby 
měli "
+"způsob, jak je vytvořit."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Aby tyto svobody byly skutečné, musí platit tak dlouho, dokud se něčím "
-"neproviníte; jestliže má vývojář software moc změnit licenci, bez 
toho, aniž "
-"byste mu svým jednáním k tomu zavdali příčinu, nejedná se o svobodný "
-"software."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Přesto jsou však jistá pravidla o způsobu distribuce svobodného software 
"
 "přijatelná, pokud nejsou v rozporu se základními svobodami. Například 
<a "
@@ -377,39 +430,8 @@
 "„svobodný software“, „copyleftovaný software“ a jiné kategorie 
software "
 "vztahují."
 
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "``Free software'' does not mean ``non-commercial''.  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 ""
-"&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>."
-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: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 #. type: Content of: <p>
@@ -422,15 +444,14 @@
 #| "condition.  (Note that such a rule still leaves you the choice of whether "
 #| "to publish the program or not.)"
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Pravidla, jak vytvořit balík modifikované verze jsou akceptovatelná, "
 "jestliže nepotlačují vaši svobodu modifikované verze vydávat. Pravidla, 
že "
@@ -461,6 +482,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -499,6 +524,29 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, without your doing anything to give cause, the "
+#| "software is not free."
+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 "
+"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."
+msgstr ""
+"Aby tyto svobody byly skutečné, musí platit tak dlouho, dokud se něčím "
+"neproviníte; jestliže má vývojář software moc změnit licenci, bez 
toho, aniž "
+"byste mu svým jednáním k tomu zavdali příčinu, nejedná se o svobodný "
+"software."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -514,6 +562,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -534,6 +586,10 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -564,6 +620,10 @@
 "philosophy/fs-translations.html\">překladů termínu „svobodný 
software“ <cite>"
 "[free software]</cite> </a> do různých jazyků."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -602,6 +662,10 @@
 "kritéria obnovíme, aby bylo jednodušší porozumět tomu, proč některé 
licence "
 "byly/nebyly schváleny."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""

Index: po/free-sw.da.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.da.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/free-sw.da.po    20 Aug 2016 14:58:39 -0000      1.6
+++ po/free-sw.da.po    16 Nov 2016 21:58:09 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -105,6 +105,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 # | [-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
@@ -197,50 +201,38 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
+"&ldquo;Fri software&rdquo; betyder ikke &ldquo;ikke-kommerciel&rdquo;. Et "
+"fri software program skal være tilgængelig for kommerciel brug, kommerciel "
+"udvikling og kommerciel distribution. Kommerciel udvikling af fri software "
+"er ikke længere ualmindeligt - sådan fri kommerciel software er meget "
+"vigtig. Måske har du 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>."
 
-# | [-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
-# | modifications, either gratis or charging a fee for distribution, to <a
-# | 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: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms. Thus, you "
-#| "should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Et program er fri software, hvis brugerne har alle disse friheder. Dermed "
-"sagt, at du bør have frihed til at redistribuere kopier enten med eller uden 
"
-"ændringer, enten gratis eller mod et gebyr, til <a href=\"#exportcontrol"
-"\">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: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
-msgstr ""
-"Du bør også have friheden til at lave ændringer og bruge dem privat til 
dit "
-"eget arbejde eller din egen fornøjelse uden overhovedet at omtale det for "
-"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."
+# | The freedom to run the [-program,-] {+program as you wish,+} for any
+# | purpose (freedom 0).
+#. type: Content of: <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 "Friheden til at køre programmet til ethvert formål (frihed 0)."
 
 # | 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,
@@ -280,24 +272,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Friheden til at redistribuere kopier inkluderer binære eller kørbare 
udgaver "
-"af programmet, såvel som program-koden for både ændrede som ikke ændrede "
-"versioner. (Distribution af programmer i en kørbar udgave er nødvendigt for 
"
-"et let installerbart fri operativ system.)  Det er OK, hvis det ikke kan "
-"lade sig gøre at producere en binær eller kørbar udgave af et bestemt "
-"program (idet nogen sprog ikke understøtter det), men du skal have friheden "
-"til at redistribuere sådanne udgaver, hvis du kan udvikle en måde at "
-"producere dem."
 
 # | In order for [-the-] freedoms {+1 and 3 (the freedom+} to make
 # | changes[-,-] and {+the freedom+} to publish [-improved versions,-] {+the
@@ -346,6 +323,63 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Friheden til at redistribuere kopier, så du kan hjælpe din nabo (frihed 2)."
+
+# | [-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
+# | modifications, either gratis or charging a fee for distribution, to <a
+# | 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: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms. Thus, you "
+#| "should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Et program er fri software, hvis brugerne har alle disse friheder. Dermed "
+"sagt, at du bør have frihed til at redistribuere kopier enten med eller uden 
"
+"ændringer, enten gratis eller mod et gebyr, til <a href=\"#exportcontrol"
+"\">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: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Du bør også have friheden til at lave ændringer og bruge dem privat til 
dit "
+"eget arbejde eller din egen fornøjelse uden overhovedet at omtale det for "
+"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: <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"
@@ -353,38 +387,46 @@
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-# | 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
-# | restrictions to its terms,+} without your doing anything {+wrong+} to give
-# | cause, the software is not free.
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, without your doing anything to give cause, the "
-#| "software is not free."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Friheden til at redistribuere kopier inkluderer binære eller kørbare 
udgaver "
+"af programmet, såvel som program-koden for både ændrede som ikke ændrede "
+"versioner. (Distribution af programmer i en kørbar udgave er nødvendigt for 
"
+"et let installerbart fri operativ system.)  Det er OK, hvis det ikke kan "
+"lade sig gøre at producere en binær eller kørbar udgave af et bestemt "
+"program (idet nogen sprog ikke understøtter det), men du skal have friheden "
+"til at redistribuere sådanne udgaver, hvis du kan udvikle en måde at "
+"producere dem."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"For, at disse friheder kan være ægte, skal de være uigenkaldelige så 
længe "
-"du ikke gør noget forkert. Hvis udvikleren af programmet har ret til at "
-"ophæve licensen uden, at du har gjort noget til at foranledige det, så er "
-"programmet ikke fri software."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Dog er visse former for regler angående måden, hvorpå distributionen af 
fri "
 "software foregår på, acceptable, når de ikke er i konflikt med de centrale 
"
@@ -439,32 +481,8 @@
 "software&rdquo;, &ldquo;copyleft software&rdquo; og andre kategorier af "
 "software relaterer til hinanden."
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"&ldquo;Fri software&rdquo; betyder ikke &ldquo;ikke-kommerciel&rdquo;. Et "
-"fri software program skal være tilgængelig for kommerciel brug, kommerciel "
-"udvikling og kommerciel distribution. Kommerciel udvikling af fri software "
-"er ikke længere ualmindeligt - sådan fri kommerciel software er meget "
-"vigtig. Måske har du 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: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 # | [-Rules-]{+However, rules+} about how to package a modified version are
@@ -495,15 +513,14 @@
 #| "require that, if you have distributed a modified version and a previous "
 #| "developer asks for a copy of it, you must send one."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Regler om, hvordan du skal pakke en ændret version er acceptabelt, så 
længe "
 "det ikke reelt forhindrer din frihed til at udgive ændrede versioner. "
@@ -537,6 +554,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # | 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
@@ -585,6 +606,34 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# | 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
+# | restrictions to its terms,+} without your doing anything {+wrong+} to give
+# | cause, the software is not free.
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, without your doing anything to give cause, the "
+#| "software is not free."
+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 "
+"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."
+msgstr ""
+"For, at disse friheder kan være ægte, skal de være uigenkaldelige så 
længe "
+"du ikke gør noget forkert. Hvis udvikleren af programmet har ret til at "
+"ophæve licensen uden, at du har gjort noget til at foranledige det, så er "
+"programmet ikke fri software."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -600,6 +649,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -620,6 +673,10 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # | 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. 
@@ -659,6 +716,10 @@
 "fs-translations.html\">oversættelser af &ldquo;fri software&rdquo;</a> til "
 "forskellige sprog."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -685,6 +746,10 @@
 "opdaterer vi som regel kriterierne, for at gøre det nemmere at se, hvorfor "
 "en bestemt licens kvalificerer sig eller ej."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.de.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- po/free-sw.de.po    12 Oct 2016 13:00:12 -0000      1.84
+++ po/free-sw.de.po    16 Nov 2016 21:58:09 -0000      1.85
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-09-09 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 
 #. type: Content of: <title>
 msgid "What is free software? - GNU Project - Free Software Foundation"
@@ -99,6 +100,10 @@
 "href=\"/philosophy/free-software-even-more-important\">Instrument "
 "ungerechter Macht</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -178,41 +183,43 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"Der weitere Text<!-- dieser Seite--> erläutert, was bestimmte Freiheiten "
-"adäquat macht oder nicht."
+"<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: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"<cite><q>Die Freiheit<ins>, das Programm weiterzuverbreiten und […] der "
-"Öffentlichkeit freizugeben</ins></q></cite> (Freiheit <em>2</em> und <em>3</"
-"em>) bedeutet, dass man die Freiheit hat Kopien an <a href=\"#exportcontrol"
-"\">jedermann überall</a> weiterzugeben (entweder mit oder ohne "
-"Modifikationen, gratis oder gegen Gebühr für den Vertrieb). <em>Frei</em> "
-"sein bedeutet, diese Dinge (unter anderem) vornehmen zu können, ohne fragen "
-"oder für die Berechtigung zahlen zu müssen."
+"Der weitere Text<!-- dieser Seite--> erläutert, was bestimmte Freiheiten "
+"adäquat macht oder nicht."
 
-# (+) sollte _es_ nicht (RT#927799)
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+# | The freedom to run the program as you [-wish, for any purpose (freedom
+# | 0).-] {+wish+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Außerdem sollte man auch die Freiheit haben Modifikationen vorzunehmen und "
-"privat im eigenen Werk oder Spiel zu nutzen, ohne auch nur deren Existenz zu "
-"erwähnen. Veröffentlicht man die Änderungen, sollte es nicht erforderlich "
-"sein, irgendjemand im Besonderen oder auf irgendeine bestimmte Weise zu "
-"benachrichtigen."
+"Die Freiheit, das Programm auszuführen wie man möchte, für jeden Zweck 
<em>"
+"(Freiheit 0)</em>."
 
 # (+) steht _es_ dieser Person
 # (RT#927799)
@@ -248,25 +255,9 @@
 "ausführen möchte. Welche Funktionalität das Programm hat oder ob es 
dafür, "
 "was man damit vor hat, geeignet ist, hat damit nichts zu tun."
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"<cite><q>Die Freiheit, Programmkopien aufs neue zu distribuieren</q></cite> "
-"muss binäre oder ausführbare Formen des Programms als auch den Quellcode 
für "
-"modifizierte und unmodifizierte Versionen beinhalten (die Distribution von "
-"Programmen in ausführbarer Form ist für bequem installierbare freie "
-"Betriebssysteme notwendig). Es ist in Ordnung, wenn es für bestimmte "
-"Anwendungen keine Möglichkeit gibt eine Binärdatei oder ausführbare Form 
zu "
-"erstellen (da einige Programmiersprachen diese Funktion nicht unterstützen), 
"
-"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: <p>
 msgid ""
@@ -324,6 +315,59 @@
 
 #. type: Content of: <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 ""
+"Ob eine Änderung eine Verbesserung darstellt, ist eine subjektive "
+"Angelegenheit. Wenn das Recht ein Programm zu modifizieren im Wesentlichen "
+"auf Änderungen beschränkt wird, die jemand anderes als Verbesserung "
+"betrachtet, ist das Programm unfrei."
+
+#. type: Content of: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Die Freiheit, das Programm weiterzuverbreiten und damit seinen Mitmenschen "
+"zu helfen <em>(Freiheit 2)</em>."
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"<cite><q>Die Freiheit<ins>, das Programm weiterzuverbreiten und […] der "
+"Öffentlichkeit freizugeben</ins></q></cite> (Freiheit <em>2</em> und <em>3</"
+"em>) bedeutet, dass man die Freiheit hat Kopien an <a href=\"#exportcontrol"
+"\">jedermann überall</a> weiterzugeben (entweder mit oder ohne "
+"Modifikationen, gratis oder gegen Gebühr für den Vertrieb). <em>Frei</em> "
+"sein bedeutet, diese Dinge (unter anderem) vornehmen zu können, ohne fragen "
+"oder für die Berechtigung zahlen zu müssen."
+
+# (+) sollte _es_ nicht (RT#927799)
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Außerdem sollte man auch die Freiheit haben Modifikationen vorzunehmen und "
+"privat im eigenen Werk oder Spiel zu nutzen, ohne auch nur deren Existenz zu "
+"erwähnen. Veröffentlicht man die Änderungen, sollte es nicht erforderlich "
+"sein, irgendjemand im Besonderen oder auf irgendeine bestimmte Weise zu "
+"benachrichtigen."
+
+#. type: Content of: <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"
@@ -339,26 +383,52 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"<cite><q>Die Freiheit, Programmkopien aufs neue zu distribuieren</q></cite> "
+"muss binäre oder ausführbare Formen des Programms als auch den Quellcode 
für "
+"modifizierte und unmodifizierte Versionen beinhalten (die Distribution von "
+"Programmen in ausführbarer Form ist für bequem installierbare freie "
+"Betriebssysteme notwendig). Es ist in Ordnung, wenn es für bestimmte "
+"Anwendungen keine Möglichkeit gibt eine Binärdatei oder ausführbare Form 
zu "
+"erstellen (da einige Programmiersprachen diese Funktion nicht unterstützen), 
"
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Damit diese Freiheiten wirklich gelten, müssen diese dauerhaft und "
-"unwiderruflich sein&#160;&#8209;&#160;solange man nichts Unrechtes anstellt. "
-"Sofern Softwareentwickler die Macht haben, die Lizenz zu ihren Bedingungen "
-"zu widerrufen oder rückwirkend Beschränkungen hinzuzufügen, ohne dafür "
-"Anlass gegeben zu haben, ist die Software unfrei."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+# | [-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.
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Allerdings sind bestimmte Richtlinien über die Art und Weise Freie Software "
 "zu verbreiten akzeptabel, sofern sie nicht den wesentlichen Freiheiten "
@@ -389,49 +459,40 @@
 "sich <em>Freie Software</em>, <em>Software mit Copyleft</em> und andere "
 "Softwarekategorien aufeinander beziehen)."
 
-#. type: Content of: <p>
-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>."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 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: <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 ""
-"Ob eine Änderung eine Verbesserung darstellt, ist eine subjektive "
-"Angelegenheit. Wenn das Recht ein Programm zu modifizieren im Wesentlichen "
-"auf Änderungen beschränkt wird, die jemand anderes als Verbesserung "
-"betrachtet, ist das Programm unfrei."
-
-#. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Richtlinien, wie man eine modifizierte Version verpacken kann, sind "
 "allerdings akzeptabel, sofern sie nicht substantiell die Freiheit "
@@ -482,6 +543,10 @@
 "<em>Alias</em>-Funktion gibt, die erlaubt, den Namen des Originalprogramms "
 "als Decknamen für die modifizierte Version anzugeben."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -522,6 +587,24 @@
 "spätere Änderung im Exportgesetz die Erfordernis trivial und damit die "
 "Software unfrei machen könnte."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Damit diese Freiheiten wirklich gelten, müssen diese dauerhaft und "
+"unwiderruflich sein&#160;&#8209;&#160;solange man nichts Unrechtes anstellt. "
+"Sofern Softwareentwickler die Macht haben, die Lizenz zu ihren Bedingungen "
+"zu widerrufen oder rückwirkend Beschränkungen hinzuzufügen, ohne dafür "
+"Anlass gegeben zu haben, ist die Software unfrei."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -546,6 +629,10 @@
 "oder wo Rechtsstreitigkeiten durchgeführt werden müssen oder beides.<a 
href="
 "\"#tn2\" id=\"tn2-ref\" class=\"transnote\">[2]</a>"
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -581,6 +668,10 @@
 "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: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -602,6 +693,10 @@
 "href=\"/philosophy/fs-translations\"><cite>Übersetzungen des Begriffs "
 "<em>Freie Software</em></cite></a>."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -629,6 +724,10 @@
 "gebracht, werden diese Kriterien aktualisiert, um verständlicher zu machen, "
 "warum sich bestimmte Lizenzen qualifizieren oder nicht."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.el.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.el.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/free-sw.el.po    20 Aug 2016 14:58:39 -0000      1.10
+++ po/free-sw.el.po    16 Nov 2016 21:58:09 -0000      1.11
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -99,6 +99,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -180,46 +184,41 @@
 msgstr ""
 
 #. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
+#| "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 ""
-"Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
-"copies, either with or without modifications, either gratis or charging a "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"Ένα πρόγραμμα θεωρείται ελεύθερο 
λογισμικό όταν οι χρήστες του έχουν όλες "
-"τις παραπάνω ελευθερίες. Επομένως, θα 
πρέπει να είστε ελεύθεροι να "
-"αναδιανέμετε αντίγραφα, με ή χωρίς 
τροποποιήσεις, δωρεάν ή χρεώνοντας για "
-"την διανομή, στον <a 
href=\"#exportcontrol\">οποιονδήποτε και οπουδήποτε</"
-"a>. Το να είστε ελεύθεροι να κάνετε όλα τα 
παραπάνω σημαίνει (μεταξύ άλλων) "
-"πως δεν χρειάζεται να ζητήσετε εξου
σιοδότηση ή να πληρώσετε κάποιον ώστε να "
-"λάβετε τη ανάλογη άδεια."
+"Μπορεί να έχετε πληρώσει για να προμηθευ
τείτε κάποια αντίγραφα ελεύθερου "
+"λογισμικού, ή να έχετε προμηθευτεί τα 
αντίγραφα χωρίς κάποια οικονομική "
+"επιβάρυνση. Ανεξαρτήτως όμως από τον 
τρόπο προμήθειας, θα πρέπει πάντα να "
+"έχετε την ελευθερία να τροποποιείτε το 
λογισμικό, ακόμα και να <a href=\"/"
+"philosophy/selling.html\">πουλάτε αντίγραφα του</a>."
 
 #. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Θα πρέπει επίσης να έχετε την ελευθερία να 
κάνετε τροποποιήσεις και να τις "
-"χρησιμοποιείτε ιδιωτικά στην δουλειά ή 
για διασκέδαση, χωρίς να χρειάζεται "
-"να το αναφέρετε. Αν δημοσιεύσετε τις 
αλλαγές σας, δεν είστε υποχρεωμένοι να "
-"ειδοποιήσετε κάποιο συγκεκριμένο άτομο."
+
+#. type: Content of: <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 ""
+"Την ελευθερία να εκτελείτε το πρόγραμμα, 
για οποιονδήποτε σκοπό (ελευθερία "
+"0)."
 
 #. type: Content of: <p>
 msgid ""
@@ -250,25 +249,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Η ελευθερία της αναδιανομής αντιγράφων θα 
πρέπει να περιλαμβάνει εκτελέσιμες "
-"(executable) μορφές του προγράμματος, καθώς και 
τον πηγαίο κώδικα, τόσο για "
-"την τροποποιημένη όσο και για την αρχική 
έκδοση του προγράμματος. (Η διανομή "
-"προγραμμάτων σε εκτελέσιμη μορφή είναι 
απαραίτητη για εγκατεστημένα ελεύθερα "
-"λειτουργικά συστήματα). Θεωρείται δεκτό 
όταν δεν υπάρχει τρόπος να "
-"δημιουργηθεί η εκτελέσιμη μορφή για 
κάποιο συγκεκριμένο πρόγραμμα (από τη "
-"στιγμή που μερικές γλώσσες δεν υ
ποστηρίζουν κάτι τέτοιο), αλλά θα πρέπει να "
-"έχετε την ελευθερία να αναδιανέμετε 
τέτοιες μορφές σε περίπτωση που "
-"αναπτύξετε ή βρείτε κάποιο δικό σας τρόπο 
να τις δημιουργήσετε)."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -325,6 +308,70 @@
 "να θεωρηθεί ελεύθερη (δηλαδή άδεια 
ελεύθερου λογισμικού)."
 
 #. type: Content of: <p>
+#, 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."
+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 ""
+"&ldquo;Ελεύθερο λογισμικό&rdquo; δεν σημαίνει 
&ldquo;μη-εμπορικό&rdquo;. Ένα "
+"ελεύθερο πρόγραμμα θα πρέπει να είναι 
διαθέσιμο για εμπορική χρήση, εμπορική "
+"ανάπτυξη ή εμπορική διανομή. Η εμπορική 
ανάπτυξη του ελευθέρου λογισμικού "
+"δεν είναι ασυνήθιστη. Αντιθέτως, τέτοιου 
είδους ελεύθερο λογισμικό είναι "
+"πολύ σημαντικό να υπάρχει."
+
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Την ελευθερία να αναδιανέμετε αντίγραφα 
του προγράμματος ώστε να βοηθάτε το "
+"συνάνθρωπο σας (ελευθερία 2)."
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Ένα πρόγραμμα θεωρείται ελεύθερο 
λογισμικό όταν οι χρήστες του έχουν όλες "
+"τις παραπάνω ελευθερίες. Επομένως, θα 
πρέπει να είστε ελεύθεροι να "
+"αναδιανέμετε αντίγραφα, με ή χωρίς 
τροποποιήσεις, δωρεάν ή χρεώνοντας για "
+"την διανομή, στον <a 
href=\"#exportcontrol\">οποιονδήποτε και οπουδήποτε</"
+"a>. Το να είστε ελεύθεροι να κάνετε όλα τα 
παραπάνω σημαίνει (μεταξύ άλλων) "
+"πως δεν χρειάζεται να ζητήσετε εξου
σιοδότηση ή να πληρώσετε κάποιον ώστε να "
+"λάβετε τη ανάλογη άδεια."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Θα πρέπει επίσης να έχετε την ελευθερία να 
κάνετε τροποποιήσεις και να τις "
+"χρησιμοποιείτε ιδιωτικά στην δουλειά ή 
για διασκέδαση, χωρίς να χρειάζεται "
+"να το αναφέρετε. Αν δημοσιεύσετε τις 
αλλαγές σας, δεν είστε υποχρεωμένοι να "
+"ειδοποιήσετε κάποιο συγκεκριμένο άτομο."
+
+#. type: Content of: <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 "
@@ -334,31 +381,46 @@
 msgstr ""
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, without your doing anything to give cause, the "
-#| "software is not free."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Η ελευθερία της αναδιανομής αντιγράφων θα 
πρέπει να περιλαμβάνει εκτελέσιμες "
+"(executable) μορφές του προγράμματος, καθώς και 
τον πηγαίο κώδικα, τόσο για "
+"την τροποποιημένη όσο και για την αρχική 
έκδοση του προγράμματος. (Η διανομή "
+"προγραμμάτων σε εκτελέσιμη μορφή είναι 
απαραίτητη για εγκατεστημένα ελεύθερα "
+"λειτουργικά συστήματα). Θεωρείται δεκτό 
όταν δεν υπάρχει τρόπος να "
+"δημιουργηθεί η εκτελέσιμη μορφή για 
κάποιο συγκεκριμένο πρόγραμμα (από τη "
+"στιγμή που μερικές γλώσσες δεν υ
ποστηρίζουν κάτι τέτοιο), αλλά θα πρέπει να "
+"έχετε την ελευθερία να αναδιανέμετε 
τέτοιες μορφές σε περίπτωση που "
+"αναπτύξετε ή βρείτε κάποιο δικό σας τρόπο 
να τις δημιουργήσετε)."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Αυτές οι ελευθερίες θα είναι πραγματικές 
και αμετάκλητες όσο δεν κάνετε κάτι "
-"λάθος. Αν ο προγραμματιστής του 
λογισμικού ανακαλέσει την άδεια, χωρίς να "
-"έχετε δώσει εσείς την αφορμή τότε το 
λογισμικό δεν θεωρείται ελεύθερο."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Ωστόσο, μερικοί κανόνες που αφορούν τον 
τρόπο με τον οποίο διανέμεται το "
 "ελεύθερο λογισμικό είναι αποδεκτοί όταν 
δεν συγκρούονται με τις τέσσερις "
@@ -380,46 +442,9 @@
 "software relate to each other."
 msgstr ""
 
-#. type: Content of: <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 ""
-"&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>."
-msgstr ""
-"Μπορεί να έχετε πληρώσει για να προμηθευ
τείτε κάποια αντίγραφα ελεύθερου "
-"λογισμικού, ή να έχετε προμηθευτεί τα 
αντίγραφα χωρίς κάποια οικονομική "
-"επιβάρυνση. Ανεξαρτήτως όμως από τον 
τρόπο προμήθειας, θα πρέπει πάντα να "
-"έχετε την ελευθερία να τροποποιείτε το 
λογισμικό, ακόμα και να <a href=\"/"
-"philosophy/selling.html\">πουλάτε αντίγραφα του</a>."
-
-#. type: Content of: <p>
-#, 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."
-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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"&ldquo;Ελεύθερο λογισμικό&rdquo; δεν σημαίνει 
&ldquo;μη-εμπορικό&rdquo;. Ένα "
-"ελεύθερο πρόγραμμα θα πρέπει να είναι 
διαθέσιμο για εμπορική χρήση, εμπορική "
-"ανάπτυξη ή εμπορική διανομή. Η εμπορική 
ανάπτυξη του ελευθέρου λογισμικού "
-"δεν είναι ασυνήθιστη. Αντιθέτως, τέτοιου 
είδους ελεύθερο λογισμικό είναι "
-"πολύ σημαντικό να υπάρχει."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -437,15 +462,14 @@
 #| "a copy of it, you must send one, or that you identify yourself on your "
 #| "modifications."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Κανόνες για την διαδικασία 
πακεταρίσματος (packaging) μίας τροποποιημένης 
"
 "έκδοσης είναι αποδεκτοί όταν δεν σας 
περιορίζουν ουσιαστικά την ελευθερία να "
@@ -511,6 +535,10 @@
 "ελεύθερο λογισμικό,&rdquo; &ldquo;λογισμικό που 
χρησιμοποιεί την άδεια "
 "αντιγραφής&rdquo; καθώς και άλλων 
κατηγοριών λογισμικού."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -551,6 +579,28 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, without your doing anything to give cause, the "
+#| "software is not free."
+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 "
+"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."
+msgstr ""
+"Αυτές οι ελευθερίες θα είναι πραγματικές 
και αμετάκλητες όσο δεν κάνετε κάτι "
+"λάθος. Αν ο προγραμματιστής του 
λογισμικού ανακαλέσει την άδεια, χωρίς να "
+"έχετε δώσει εσείς την αφορμή τότε το 
λογισμικό δεν θεωρείται ελεύθερο."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -566,6 +616,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -601,6 +655,10 @@
 "δικαιώματα αδυνατούν, και ο οποίος δεν 
αναφέρεται εδώ ως νόμιμος, θα πρέπει "
 "να το σκεφτούμε και πιθανότατα θα 
αποφασίσουμε πως είναι ανελεύθερη."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -633,6 +691,10 @@
 "\">μεταφράσεων του όρου &ldquo;ελεύθερο 
λογισμικό&rdquo;</a> σε διάφορες "
 "γλώσσες."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -659,6 +721,10 @@
 "συμπέρασμα για ένα καινούργιο θέμα, συχνά 
ανανεώνουμε αυτά τα κριτήρια για "
 "να είναι πιο εύκολο να δούμε εάν συ
γκεκριμένες άδειες είναι δεκτές ή όχι."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.es.po,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- po/free-sw.es.po    25 Aug 2016 17:12:57 -0000      1.114
+++ po/free-sw.es.po    16 Nov 2016 21:58:09 -0000      1.115
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.es.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-25 19:09+0200\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-08-25 19:00+0100\n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -20,6 +20,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
@@ -115,6 +116,10 @@
 "href=\"/philosophy/free-software-even-more-important.html\">un instrumento "
 "de poder injusto</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -193,42 +198,46 @@
 "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: <p>
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"En el resto de esta página tratamos algunos puntos que aclaran qué es lo 
que "
-"hace que las libertades específicas sean adecuadas o no."
+"«Software libre» no significa que «no es comercial». Un programa libre 
debe "
+"estar disponible para el uso comercial, la programación comercial y la "
+"distribución comercial. La programación comercial de software libre ya no 
es "
+"inusual; el software libre comercial es muy importante. Puede haber pagado "
+"dinero para obtener copias de software libre, o puede haber obtenido copias "
+"sin costo. Pero sin tener en cuenta 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: <p>
 #. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"La libertad para distribuir (libertades 2 y 3) significa que usted tiene la "
-"libertad para redistribuir copias con o sin modificaciones, ya sea "
-"gratuitamente o cobrando una tarifa por la distribución, a <a href="
-"\"#exportcontrol\">cualquiera en cualquier parte</a>. Ser libre de hacer "
-"esto significa, entre otras cosas, que no tiene que pedir ni pagar ningún "
-"permiso para hacerlo."
+"En el resto de esta página tratamos algunos puntos que aclaran qué es lo 
que "
+"hace que las libertades específicas sean adecuadas o no."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+# type: Content of: <ul><li>
+#. type: Content of: <h4>
+# | The freedom to run the program as you [-wish, for any purpose (freedom
+# | 0).-] {+wish+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"También debe tener la libertad de hacer modificaciones y usarlas en privado "
-"para su propio trabajo o pasatiempo, sin siquiera mencionar que existen. Si "
-"publica sus cambios, no debe estar obligado a notificarlo a nadie en "
-"particular, ni de ninguna manera en particular."
+"La libertad de ejecutar el programa como se desea, con cualquier propósito "
+"(libertad 0)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -264,26 +273,9 @@
 "tipo de funcionalidades que el programa posee ni con el hecho de que el "
 "programa sea o no sea útil para lo que se quiere hacer."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"La libertad de redistribuir copias debe incluir las formas binarias o "
-"ejecutables del programa, así como el código fuente, tanto para las "
-"versiones modificadas como para las que no lo estén. (Distribuir programas "
-"en forma de ejecutables es necesario para que los sistemas operativos libres "
-"se puedan instalar fácilmente). Resulta aceptable si no existe un modo de "
-"producir un formato binario o ejecutable para un programa específico, dado "
-"que algunos lenguajes no incorporan esa característica, pero debe tener la "
-"libertad de redistribuir dichos formatos si encontrara o programara una "
-"forma de hacerlo."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -340,6 +332,58 @@
 # type: Content of: <p>
 #. type: Content of: <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 ""
+"Si una modificación constituye o no una mejora, es un asunto subjetivo. Si "
+"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: <ul><li>
+#. type: Content of: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"La libertad de redistribuir copias para ayudar a su prójimo (libertad 2)."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"La libertad para distribuir (libertades 2 y 3) significa que usted tiene la "
+"libertad para redistribuir copias con o sin modificaciones, ya sea "
+"gratuitamente o cobrando una tarifa por la distribución, a <a href="
+"\"#exportcontrol\">cualquiera en cualquier parte</a>. Ser libre de hacer "
+"esto significa, entre otras cosas, que no tiene que pedir ni pagar ningún "
+"permiso para hacerlo."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"También debe tener la libertad de hacer modificaciones y usarlas en privado "
+"para su propio trabajo o pasatiempo, sin siquiera mencionar que existen. Si "
+"publica sus cambios, no debe estar obligado a notificarlo a nadie en "
+"particular, ni de ninguna manera en particular."
+
+# type: Content of: <p>
+#. type: Content of: <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"
@@ -356,27 +400,53 @@
 # type: Content of: <p>
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"La libertad de redistribuir copias debe incluir las formas binarias o "
+"ejecutables del programa, así como el código fuente, tanto para las "
+"versiones modificadas como para las que no lo estén. (Distribuir programas "
+"en forma de ejecutables es necesario para que los sistemas operativos libres "
+"se puedan instalar fácilmente). Resulta aceptable si no existe un modo de "
+"producir un formato binario o ejecutable para un programa específico, dado "
+"que algunos lenguajes no incorporan esa característica, pero debe tener la "
+"libertad de redistribuir dichos formatos si encontrara o programara una "
+"forma de hacerlo."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Para que estas libertades sean reales, deben ser permanentes e irrevocables "
-"siempre que usted no cometa ningún error; si el programador del software "
-"tiene el poder de revocar la licencia, o de añadir restricciones a las "
-"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: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+# | [-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.
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Sin embargo, ciertos tipos de reglas sobre la manera de distribuir software "
 "libre son aceptables, cuando no entran en conflicto con las libertades "
@@ -407,50 +477,41 @@
 "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: <p>
-#. type: Content of: <p>
-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>."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"«Software libre» no significa que «no es comercial». Un programa libre 
debe "
-"estar disponible para el uso comercial, la programación comercial y la "
-"distribución comercial. La programación comercial de software libre ya no 
es "
-"inusual; el software libre comercial es muy importante. Puede haber pagado "
-"dinero para obtener copias de software libre, o puede haber obtenido copias "
-"sin costo. Pero sin tener en cuenta 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: <p>
 #. type: Content of: <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 ""
-"Si una modificación constituye o no una mejora, es un asunto subjetivo. Si "
-"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: <p>
-#. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "No obstante, eventuales reglas sobre cómo empaquetar una versión modificada 
"
 "son aceptables si no limitan substancialmente su libertad para publicar "
@@ -500,6 +561,10 @@
 "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: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -542,6 +607,25 @@
 "podría hacer que el requisito dejara de ser trivial y que el software dejara 
"
 "de ser libre."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Para que estas libertades sean reales, deben ser permanentes e irrevocables "
+"siempre que usted no cometa ningún error; si el programador del software "
+"tiene el poder de revocar la licencia, o de añadir restricciones a las "
+"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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -565,6 +649,10 @@
 "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: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -601,6 +689,10 @@
 "no está mencionado aquí como legítimo, tendremos que analizar el caso, y "
 "probablemente concluyamos que no es libre."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -622,6 +714,10 @@
 "tenemos una lista de las <a href=\"/philosophy/fs-translations.html"
 "\">traducciones correctas de «software libre»</a> a varios idiomas."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -651,6 +747,10 @@
 "criterios para que resulte más fácil ver por qué una cierta licencia puede 
o "
 "no ser calificada como libre."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.fa.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.fa.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/free-sw.fa.po    20 Aug 2016 14:58:39 -0000      1.6
+++ po/free-sw.fa.po    16 Nov 2016 21:58:09 -0000      1.7
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <address@hidden>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -100,6 +100,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -179,44 +183,35 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
+"« نرم‌افزار آزاد» به معنای &ldquo;غیر تجاری» 
نیست. یک برنامه آزاد باید برای "
+"استفاده تجاری، توسعه تجاری، و توزیع تجاری 
در دسترس باشد. توسعه تجاری "
+"نرم‌افزار آزاد دیگر غیر معمول نیست، بلکه 
چنین نرم‌افزارهای آزاد تجاری بسیار "
+"مهم هستند. بنابراین شما ممکن است پولی 
پرداخت کرده باشید تا کپی‌هایی از "
+"نرم‌افزار آزاد را بدست آورده باشید و یا مم
کن است کپی‌ها را بدون پرداخت هزینه "
+"بدست آورده باشید. اما صرفنظر از اینکه 
چگونه کپی‌ها را بدست آورده باشید، شما "
+"همیشه این آزادی را دارید تا نرم‌افزار را 
کپی کنید و تغییر دهید و یا حتی <a "
+"href=\"/philosophy/selling.html\">کپی‌هایی از آن را 
بفروشید</a>."
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"در صورتی برنامه‌ای یک نرم‌افزار آزاد به 
شمار می‌آید که کاربران آن همه این "
-"آزادی‌ها را داشته باشند. بنابراین شما 
باید برای توزیع مجدد کپی‌هایی از آن، "
-"خواه با اصلاحات و تغییرات و خواه بدون آن، 
خواه رایگان و خواه در ازای دریافت "
-"وجهی، <a href=\"#exportcontrol\">برای هر شخصی و در هر 
جایی</a> آزاد باشید. "
-"آزاد بودن برای انجام این کارها (در میان 
کارهای دیگر) به این معنی است که شما "
-"مجبور به درخواست و پرداخت هزینه برای مجوز 
نیستید."
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
-msgstr ""
-"شما همچنین باید این آزادی را داشته باشید 
تا در برنامه تغییراتی ایجاد کنید و "
-"حتی بدون اشاره به وجود آنها، از آنها بطور 
خصوصی و برای کار خود استفاده کنید. "
-"اگر هم تغییرات خود را منتشر کردید، نباید م
لزم به اعلام آن به شخص خاص و یا به "
-"روش خاصی باشید."
+#. type: Content of: <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: <p>
 #, fuzzy
@@ -254,34 +249,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <p>
-#, fuzzy
-#| 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 versions.  (Distributing programs in runnable form is "
-#| "necessary for conveniently installable free operating systems.)  It is ok "
-#| "if there is no way to produce a binary or executable form for a certain "
-#| "program (since some languages don't support that feature), but you must "
-#| "have the freedom to redistribute such forms should you find or develop a "
-#| "way to make them."
-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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"آزادی برای توزیع مجدد کپی‌هایی از برنامه 
باید علاوه بر کد منبع، شامل شکل "
-"باینری و اجرایی برنامه و برای هر دو نسخه 
تغییر یافته و تغییر نیافته نیز "
-"باشد. (توزیع برنامه‌ها در شکل اجرایی برای 
سیستم‌عامل‌های آزادی که به راحتی نصب "
-"می‌شوند ضروری است.) اگر هیچ روشی برای 
تولید شکل باینری و اجرایی برای برنامه "
-"بخصوصی وجود نداشته باشد، مشکلی نیست (زیرا 
بعضی از زبانهای برنامه‌نویسی از آن "
-"ویژگی پشتیبانی نمی‌کنند). اما شما باید این 
آزادی را داشته باشید تا اگر روشی "
-"برای ارائه شکل باینری و اجرایی برنامه پیدا 
کردید، آن برنامه را مجددا به این "
-"دو شکل توزیع کنید."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -335,6 +305,66 @@
 "کننده است تا به عنوان یک مجوز آزاد شناخته 
شود."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Whether a change constitutes an improvement is a subjective matter.  If "
+#| "your modifications are limited, in substance, to changes that someone "
+#| "else considers an improvement, that is not freedom."
+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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"آزادی برای توزیع مجدد کپی‌هایی از آن، 
بنابراین شما می‌توانید به همسایگان خود "
+"کمک کنید (آزادی ۲)."
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"در صورتی برنامه‌ای یک نرم‌افزار آزاد به 
شمار می‌آید که کاربران آن همه این "
+"آزادی‌ها را داشته باشند. بنابراین شما 
باید برای توزیع مجدد کپی‌هایی از آن، "
+"خواه با اصلاحات و تغییرات و خواه بدون آن، 
خواه رایگان و خواه در ازای دریافت "
+"وجهی، <a href=\"#exportcontrol\">برای هر شخصی و در هر 
جایی</a> آزاد باشید. "
+"آزاد بودن برای انجام این کارها (در میان 
کارهای دیگر) به این معنی است که شما "
+"مجبور به درخواست و پرداخت هزینه برای مجوز 
نیستید."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"شما همچنین باید این آزادی را داشته باشید 
تا در برنامه تغییراتی ایجاد کنید و "
+"حتی بدون اشاره به وجود آنها، از آنها بطور 
خصوصی و برای کار خود استفاده کنید. "
+"اگر هم تغییرات خود را منتشر کردید، نباید م
لزم به اعلام آن به شخص خاص و یا به "
+"روش خاصی باشید."
+
+#. type: Content of: <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 "
@@ -346,30 +376,53 @@
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, or retroactively change its terms, without your "
-#| "doing anything wrong to give cause, the software is not free."
+#| "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 conveniently installable free operating systems.)  It is ok "
+#| "if there is no way to produce a binary or executable form for a certain "
+#| "program (since some languages don't support that feature), but you must "
+#| "have the freedom to redistribute such forms should you find or develop a "
+#| "way to make them."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"آزادی برای توزیع مجدد کپی‌هایی از برنامه 
باید علاوه بر کد منبع، شامل شکل "
+"باینری و اجرایی برنامه و برای هر دو نسخه 
تغییر یافته و تغییر نیافته نیز "
+"باشد. (توزیع برنامه‌ها در شکل اجرایی برای 
سیستم‌عامل‌های آزادی که به راحتی نصب "
+"می‌شوند ضروری است.) اگر هیچ روشی برای 
تولید شکل باینری و اجرایی برای برنامه "
+"بخصوصی وجود نداشته باشد، مشکلی نیست (زیرا 
بعضی از زبانهای برنامه‌نویسی از آن "
+"ویژگی پشتیبانی نمی‌کنند). اما شما باید این 
آزادی را داشته باشید تا اگر روشی "
+"برای ارائه شکل باینری و اجرایی برنامه پیدا 
کردید، آن برنامه را مجددا به این "
+"دو شکل توزیع کنید."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"برای اجرایی شدن این آزادی‌ها، آنها باید 
تا وقتیکه شما هیچ کار اشتباهی بر خلاف "
-"این آزادی‌ها انجام نداده‌اید، غیر قابل 
فسخ و قطعی بمانند. اگر توسعه‌دهنده "
-"نرم‌افزار قادر باشد مجوز نرم‌افزار را، 
بدون این که شما کاری کنید که سبب این "
-"کار شود، باطل کند، این نرم‌افزار آزاد 
نیست."
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "However, 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 ""
-"However, 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."
+"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."
 msgstr ""
 "با این حال بعضی قوانین خاص که درباره نحوه 
توزیع نرم‌افزار آزاد می‌باشند، "
 "هنگامی که با آزادی‌های اصلی در تضاد 
نباشند، قابل قبول هستند. برای نمونه «<a "
@@ -410,40 +463,9 @@
 "یکدیگر در ارتباطند، <a 
href=\"/philosophy/categories.html\">بخش‌های نرم‌افزار "
 "آزاد</a> را ببینید."
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"« نرم‌افزار آزاد» به معنای &ldquo;غیر تجاری» 
نیست. یک برنامه آزاد باید برای "
-"استفاده تجاری، توسعه تجاری، و توزیع تجاری 
در دسترس باشد. توسعه تجاری "
-"نرم‌افزار آزاد دیگر غیر معمول نیست، بلکه 
چنین نرم‌افزارهای آزاد تجاری بسیار "
-"مهم هستند. بنابراین شما ممکن است پولی 
پرداخت کرده باشید تا کپی‌هایی از "
-"نرم‌افزار آزاد را بدست آورده باشید و یا مم
کن است کپی‌ها را بدون پرداخت هزینه "
-"بدست آورده باشید. اما صرفنظر از اینکه 
چگونه کپی‌ها را بدست آورده باشید، شما "
-"همیشه این آزادی را دارید تا نرم‌افزار را 
کپی کنید و تغییر دهید و یا حتی <a "
-"href=\"/philosophy/selling.html\">کپی‌هایی از آن را 
بفروشید</a>."
-
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Whether a change constitutes an improvement is a subjective matter.  If "
-#| "your modifications are limited, in substance, to changes that someone "
-#| "else considers an improvement, that is not freedom."
-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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"اینکه آیا یک تغییر، بهبود به حساب می‌آید 
یا نه، نکته‌ای است که به ذهنیت افراد "
-"باز میگردد. اگر حق تغییر شما، محدود به چیزی 
باشد که دیگری آن را بهبود "
-"می‌داند، این آزادی نیست."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -461,15 +483,14 @@
 #| "a copy of it, you must send one, or that you identify yourself on your "
 #| "modifications."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "قوانین مربوط به نحوه بسته‌بندی یک بسته 
تغییر یافته نیز در صورتیکه بطور عملی و "
 "قابل اجرا، آزادی شما برای انتشار نسخه 
تغییر یافته را منع نکنند، قابل قبول "
@@ -503,6 +524,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -545,6 +570,29 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, or retroactively change its terms, without your "
+#| "doing anything wrong to give cause, the software is not free."
+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 "
+"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."
+msgstr ""
+"برای اجرایی شدن این آزادی‌ها، آنها باید 
تا وقتیکه شما هیچ کار اشتباهی بر خلاف "
+"این آزادی‌ها انجام نداده‌اید، غیر قابل 
فسخ و قطعی بمانند. اگر توسعه‌دهنده "
+"نرم‌افزار قادر باشد مجوز نرم‌افزار را، 
بدون این که شما کاری کنید که سبب این "
+"کار شود، باطل کند، این نرم‌افزار آزاد 
نیست."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -560,6 +608,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -609,6 +661,10 @@
 "قانونی ذکر نشده باشد، ما درباره آن فکر 
خواهیم کرد و احتمالا آن را غیر آزاد "
 "تشخیص خواهیم داشت."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -639,6 +695,10 @@
 "ببینید. ما همچنین فهرستی از <a 
href=\"/philosophy/fs-translations.html"
 "\">ترجمه‌های «نرم‌افزار آزاد»</a> به 
زبانهای مختلف داریم."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -665,6 +725,10 @@
 "می‌رسیم، غالبا این معیارها را به روز م
ی‌کنیم تا راحت‌تر ببینید که چرا مجوز‌های "
 "خاص صلاحیت دارند و یا ندارند."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.fr.po,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- po/free-sw.fr.po    20 Aug 2016 17:05:03 -0000      1.117
+++ po/free-sw.fr.po    16 Nov 2016 21:58:09 -0000      1.118
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-08-20 19:03+0200\n"
 "Last-Translator: Sogal <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -110,6 +111,10 @@
 "href=\"/philosophy/free-software-even-more-important.html\">l'instrument "
 "d'un pouvoir injuste</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -188,37 +193,43 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"La suite de cette page s'attache à clarifier certains détails sur ce qui "
-"fait que des libertés particulières sont adéquates ou non."
+"« Logiciel libre » ne signifie pas « non commercial ». Un logiciel 
libre "
+"doit permettre l'usage commercial, le développement commercial et la "
+"distribution commerciale. Le développement commercial de logiciel libre "
+"n'est plus l'exception ; de tels logiciels libres commerciaux sont très "
+"importants. 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: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Avoir la liberté de distribution (libertés 2 et 3) signifie que vous êtes "
-"libre de redistribuer des copies, avec ou sans modification, gratuitement ou "
-"non, à <a href=\"#exportcontrol\">tout le monde, partout</a>. Être libre de 
"
-"faire tout cela signifie (entre autres) que vous n'avez pas à demander ni à 
"
-"payer pour en avoir la permission."
+"La suite de cette page s'attache à clarifier certains détails sur ce qui "
+"fait que des libertés particulières sont adéquates ou non."
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+# | The freedom to run the program as you [-wish, for any purpose (freedom
+# | 0).-] {+wish+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Vous devez aussi avoir la liberté de faire des modifications et de les "
-"utiliser à titre privé dans votre travail ou vos loisirs, sans en 
mentionner "
-"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."
+"la liberté d'exécuter le programme comme vous voulez, pour n'importe quel "
+"usage (liberté 0) ;"
 
 #. type: Content of: <p>
 msgid ""
@@ -253,25 +264,9 @@
 "programme, ou avec le fait qu'il soit utile, ou non, pour ce que vous voulez "
 "faire.  "
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"La liberté de redistribuer des copies doit inclure les formes binaires ou "
-"exécutables du programme, tout comme le code source, que ce soit pour les "
-"versions modifiées ou non modifiées du programme (diffuser des programmes "
-"sous une forme exécutable est nécessaire pour installer commodément les "
-"systèmes d'exploitation libres). Il y a une exception s'il n'existe aucun "
-"moyen de produire de version binaire ou exécutable pour un programme "
-"déterminé (puisque certains langages ne le permettent pas), mais vous devez 
"
-"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: <p>
 msgid ""
@@ -327,6 +322,55 @@
 
 #. type: Content of: <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 ""
+"Qu'un changement constitue une amélioration ou non est subjectif. Si votre "
+"droit de faire des modifications se limite, en substance, aux changements "
+"que quelqu'un d'autre considère comme une amélioration, ce n'est pas un "
+"programme libre."
+
+#. type: Content of: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"la liberté de redistribuer des copies, donc d'aider votre voisin "
+"(liberté 2) ;"
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Avoir la liberté de distribution (libertés 2 et 3) signifie que vous êtes "
+"libre de redistribuer des copies, avec ou sans modification, gratuitement ou "
+"non, à <a href=\"#exportcontrol\">tout le monde, partout</a>. Être libre de 
"
+"faire tout cela signifie (entre autres) que vous n'avez pas à demander ni à 
"
+"payer pour en avoir la permission."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Vous devez aussi avoir la liberté de faire des modifications et de les "
+"utiliser à titre privé dans votre travail ou vos loisirs, sans en 
mentionner "
+"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: <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"
@@ -343,26 +387,52 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"La liberté de redistribuer des copies doit inclure les formes binaires ou "
+"exécutables du programme, tout comme le code source, que ce soit pour les "
+"versions modifiées ou non modifiées du programme (diffuser des programmes "
+"sous une forme exécutable est nécessaire pour installer commodément les "
+"systèmes d'exploitation libres). Il y a une exception s'il n'existe aucun "
+"moyen de produire de version binaire ou exécutable pour un programme "
+"déterminé (puisque certains langages ne le permettent pas), mais vous devez 
"
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Pour que ces libertés soient effectives, elles doivent être permanentes et "
-"irrévocables tant que vous n'avez rien fait de mal ; si le développeur du "
-"logiciel a le droit de révoquer la licence ou de lui ajouter 
rétroactivement "
-"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: <p>
-msgid ""
-"However, 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."
+# | [-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.
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Cependant, certains types de règles sur la manière de distribuer le 
logiciel "
 "libre sont acceptables tant que ces règles ne rentrent pas en conflit avec "
@@ -393,49 +463,40 @@
 "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: <p>
-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>."
-msgstr ""
-"« Logiciel libre » ne signifie pas « non commercial ». Un logiciel 
libre "
-"doit permettre l'usage commercial, le développement commercial et la "
-"distribution commerciale. Le développement commercial de logiciel libre "
-"n'est plus l'exception ; de tels logiciels libres commerciaux sont très "
-"importants. 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: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"Qu'un changement constitue une amélioration ou non est subjectif. Si votre "
-"droit de faire des modifications se limite, en substance, aux changements "
-"que quelqu'un d'autre considère comme une amélioration, ce n'est pas un "
-"programme libre."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Toutefois, des règles qui régissent la manière dont une version peut être 
"
 "modifiée sont acceptables si elles ne limitent pas de manière substantielle 
"
@@ -485,6 +546,10 @@
 "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: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -527,6 +592,24 @@
 "faire que cette exigence ait des conséquences pratiques et donc rende le "
 "logiciel non libre."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Pour que ces libertés soient effectives, elles doivent être permanentes et "
+"irrévocables tant que vous n'avez rien fait de mal ; si le développeur du "
+"logiciel a le droit de révoquer la licence ou de lui ajouter 
rétroactivement "
+"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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -550,6 +633,10 @@
 "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: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -585,6 +672,10 @@
 "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: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -606,6 +697,10 @@
 "philosophy/fs-translations.html\">traductions correctes de <cite>free "
 "software</cite></a> dans de nombreuses langues."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -634,6 +729,10 @@
 "mettions à jour ces critères pour qu'on sache plus facilement pourquoi 
telle "
 "licence s'y conforme, ou non."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.hr-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.hr-diff.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/free-sw.hr-diff.html     20 Aug 2016 14:58:39 -0000      1.22
+++ po/free-sw.hr-diff.html     16 Nov 2016 21:58:09 -0000      1.23
@@ -22,10 +22,10 @@
 &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="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 
 &lt;h3&gt;The Free Software Definition&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 &lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
@@ -61,6 +61,8 @@
 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;
 A program is free software if the program's users have the
 four essential freedoms:
@@ -95,21 +97,37 @@
 handle some cases.  If we plan to distribute A as it stands, that
 implies users will need B, so we need to judge whether both A and B
 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;</em></ins></span>
+only A needs to be free; B is not pertinent to that plan.&lt;/p&gt;
+
+&lt;p&gt;
+&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 
+&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The rest of this page clarifies certain points about what makes
 specific freedoms adequate or not.&lt;/p&gt;
 
-&lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
+<span class="removed"><del><strong>&lt;p&gt;Freedom</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The freedom</em></ins></span> to 
<span class="removed"><del><strong>distribute (freedoms 2 and 3) 
means</strong></del></span> <span class="inserted"><ins><em>run the program 
as</em></ins></span> you <span class="removed"><del><strong>are free to
 redistribute copies, either with or without modifications, either
 gratis or charging a fee for distribution, to
-&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
-things means (among other things) that you do not have to ask or pay
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being 
free</strong></del></span> <span class="inserted"><ins><em>wish&lt;/h4&gt;
+
+&lt;p&gt;
+The freedom</em></ins></span> to <span class="removed"><del><strong>do these
+things</strong></del></span> <span class="inserted"><ins><em>run the 
program</em></ins></span> means <span class="removed"><del><strong>(among other 
things) that you do not have to ask or pay
 for permission to do so.
 &lt;/p&gt;
 
 &lt;p&gt;
-You should also have the freedom to make modifications and use them
+You should also have</strong></del></span> the freedom <span 
class="removed"><del><strong>to make modifications and use them
 privately in your own work or play, without even mentioning that they
 exist.  If you do publish your changes, you should not be required to
 notify anyone in particular, or in any particular way.
@@ -117,7 +135,8 @@
 
 &lt;p&gt;
 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
+or organization</strong></del></span> <span class="inserted"><ins><em>for any 
kind of person
+or organization</em></ins></span> to use it on any kind of computer system, 
for any kind of
 overall job and purpose, without being required to communicate about it
 with the developer or any other specific entity.  In this freedom, it is
 the &lt;em&gt;user's&lt;/em&gt; purpose that matters, not the 
&lt;em&gt;developer's&lt;/em&gt;
@@ -127,21 +146,19 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-The freedom to <span class="inserted"><ins><em>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 to do.&lt;/p&gt;
-
-&lt;p&gt;
-The freedom to</em></ins></span> redistribute copies must include binary or 
executable
-forms of the program, as well as source code, for both modified and
+The freedom to <span class="removed"><del><strong>redistribute copies must 
include binary or executable
+forms of</strong></del></span> <span 
class="inserted"><ins><em>run</em></ins></span> the <span 
class="removed"><del><strong>program, as well</strong></del></span> <span 
class="inserted"><ins><em>program</em></ins></span> as <span 
class="removed"><del><strong>source code, for both modified and
 unmodified versions.  (Distributing programs in runnable form is necessary
-for conveniently installable free operating systems.)  It is OK if there
-is no way to produce a binary or executable form for a certain program
-(since some languages don't support that feature), but you must have the
-freedom to redistribute such forms should you find or develop a way to
-make them.
-&lt;/p&gt;
+for conveniently installable free operating systems.)</strong></del></span> 
<span class="inserted"><ins><em>you wish means that you are not
+forbidden or stopped from doing so.</em></ins></span>  It <span 
class="removed"><del><strong>is OK if there
+is no way</strong></del></span> <span class="inserted"><ins><em>has 
nothing</em></ins></span> to <span class="removed"><del><strong>produce a 
binary</strong></del></span> <span class="inserted"><ins><em>do with what
+functionality the program has,</em></ins></span> or <span 
class="removed"><del><strong>executable form</strong></del></span> <span 
class="inserted"><ins><em>whether it is useful</em></ins></span> for <span 
class="removed"><del><strong>a certain program
+(since some languages don't support that feature), but</strong></del></span> 
<span class="inserted"><ins><em>what</em></ins></span> you <span 
class="removed"><del><strong>must have the
+freedom</strong></del></span>
+<span class="inserted"><ins><em>want</em></ins></span> to <span 
class="removed"><del><strong>redistribute such forms should you find or develop 
a way</strong></del></span> <span class="inserted"><ins><em>do.&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;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>changes&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -173,6 +190,29 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;h4&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
+gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist.  If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -182,15 +222,26 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-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
-restrictions to its terms, without your doing anything wrong to give
-cause, the software is not free.
+<span class="removed"><del><strong>In order for these 
freedoms</strong></del></span>
+<span class="inserted"><ins><em>The freedom</em></ins></span> to <span 
class="removed"><del><strong>be real, they</strong></del></span> <span 
class="inserted"><ins><em>redistribute copies</em></ins></span> must <span 
class="removed"><del><strong>be permanent and
+irrevocable</strong></del></span> <span class="inserted"><ins><em>include 
binary or executable
+forms of the program,</em></ins></span> as <span 
class="removed"><del><strong>long</strong></del></span> <span 
class="inserted"><ins><em>well</em></ins></span> as <span 
class="removed"><del><strong>you do nothing wrong;</strong></del></span> <span 
class="inserted"><ins><em>source code, for both modified and
+unmodified versions.  (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.)  It is 
OK</em></ins></span> if <span class="removed"><del><strong>the developer of the
+software has the power</strong></del></span> <span 
class="inserted"><ins><em>there
+is no way</em></ins></span> to <span 
class="removed"><del><strong>revoke</strong></del></span> <span 
class="inserted"><ins><em>produce a binary or executable form for a certain 
program
+(since some languages don't support that feature), but you must 
have</em></ins></span> the <span 
class="removed"><del><strong>license,</strong></del></span>
+<span class="inserted"><ins><em>freedom to redistribute such forms should you 
find</em></ins></span> or <span class="removed"><del><strong>retroactively add
+restrictions to its terms, without your doing anything 
wrong</strong></del></span> <span class="inserted"><ins><em>develop a 
way</em></ins></span> to <span class="removed"><del><strong>give
+cause, the software is not free.</strong></del></span>
+<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>
+
 &lt;p&gt;
-However, certain kinds of rules about the manner of distributing free
+<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>
 (very simply stated) is the rule that when redistributing the program,
@@ -212,14 +263,16 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;p&gt;
+<span class="removed"><del><strong>&lt;p&gt;
 &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 
+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 
 &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
 &lt;/p&gt;
 
@@ -227,10 +280,11 @@
 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.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>distribution 
details&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
-However, rules about how to package a modified version are acceptable,
+<span class="removed"><del><strong>However, rules</strong></del></span>
+<span class="inserted"><ins><em>Rules</em></ins></span> 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 privately.
 Thus, it is acceptable for the license to require that you change the
@@ -262,6 +316,8 @@
 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>
+
 &lt;p&gt;
 Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
 and trade sanctions can constrain your freedom to distribute copies of
@@ -284,6 +340,16 @@
 software nonfree.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt;Legal considerations&lt;/h4&gt;
+
+&lt;p&gt;
+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
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+&lt;/p&gt;</em></ins></span>
+
 &lt;p&gt;
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -298,6 +364,8 @@
 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>
+
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -317,6 +385,8 @@
 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;
 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
@@ -328,6 +398,8 @@
 &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;
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -342,6 +414,8 @@
 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>
+
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
 software license, see our &lt;a href="/licenses/license-list.html"&gt;list
@@ -583,7 +657,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/08/20 14:58:39 $
+$Date: 2016/11/16 21:58:09 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/free-sw.hr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.hr.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/free-sw.hr.po    20 Aug 2016 14:58:39 -0000      1.39
+++ po/free-sw.hr.po    16 Nov 2016 21:58:09 -0000      1.40
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2014-04-12 09:34+0100\n"
 "Last-Translator: Martina Bebek <address@hidden>\n"
 "Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -118,6 +118,10 @@
 "\"/philosophy/free-software-even-more-important.html\">instrumentom "
 "nepravedne moći</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -185,6 +189,25 @@
 
 #. type: Content of: <p>
 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>."
+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: <p>
+msgid ""
 "The rest of this page clarifies certain points about what makes specific "
 "freedoms adequate or not."
 msgstr ""
@@ -192,31 +215,13 @@
 "slobodâ , ali isto tako opisuje i koje su situacije neadekvatne za pojedinu "
 "slobodu."
 
-#. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
-msgstr ""
-"Slobode koja se odnose na distribuiranje programa (slobode 2 i 3) "
-"podrazumijevanju slobodno dijeljene kopija – bez obzira na to jesu li "
-"programi izmijenjeni ili ne, bez obzira traži li se ili ne traži naknada za 
"
-"distribuciju – <a href=\"#exportcontrol\">svakome i svagdje</a>. Biti u "
-"mogućnosti to činiti znači da (između ostaloga)  za takve radnje nije "
-"potrebno prethodno tražiti ili platiti odobrenje."
-
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
-msgstr ""
-"Trebali biste imati i slobodu mijenjati program i koristiti izmjene privatno "
-"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: <h4>
+# | The freedom to run the [-program, for any purpose (freedom 0).-] {+program
+# | as you wish+}
+#, fuzzy
+#| msgid "The freedom to run the program, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
+msgstr "Sloboda pokretanja programa u bilo koje svrhe (sloboda 0). "
 
 #. type: Content of: <p>
 msgid ""
@@ -245,24 +250,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Sloboda distribuiranja kopija mora uključivati binarne ili izvršne datoteke 
"
-"programa kao i izvorni kod izmijenjene i izvorne inačice. Distribuiranje je "
-"programa u izvršnim datotekama nužno za slobodne operacijske sustave kako 
bi "
-"se na njih mogli lakše instalirati. Izostanak binarnih datoteka programa "
-"razumljiv je ako ne postoji način izrade binarnih ili izvršnih datoteka "
-"budući da neki programski jezici ne podržavaju tu značajku, ali ljudi 
moraju "
-"imati slobodu distribuiranja takvih oblika kako bi pronašli ili razvili "
-"način njihove izrade."
 
 #. type: Content of: <p>
 msgid ""
@@ -334,6 +324,52 @@
 
 #. type: Content of: <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 ""
+"Rezultira li izmijena poboljšanjem, subjektivna je stvar. Ako je vaše pravo 
"
+"da mijenjate program ograničeno na izmjene koje netko drugi smatra "
+"poboljšanjem, takav se program ne može smatrati slobodnim."
+
+#. type: Content of: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr "Sloboda distribucije kopijâ kako biste pomogli bližnjemu (sloboda 
2). "
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Slobode koja se odnose na distribuiranje programa (slobode 2 i 3) "
+"podrazumijevanju slobodno dijeljene kopija – bez obzira na to jesu li "
+"programi izmijenjeni ili ne, bez obzira traži li se ili ne traži naknada za 
"
+"distribuciju – <a href=\"#exportcontrol\">svakome i svagdje</a>. Biti u "
+"mogućnosti to činiti znači da (između ostaloga)  za takve radnje nije "
+"potrebno prethodno tražiti ili platiti odobrenje."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Trebali biste imati i slobodu mijenjati program i koristiti izmjene privatno "
+"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: <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"
@@ -348,21 +384,31 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Sloboda distribuiranja kopija mora uključivati binarne ili izvršne datoteke 
"
+"programa kao i izvorni kod izmijenjene i izvorne inačice. Distribuiranje je "
+"programa u izvršnim datotekama nužno za slobodne operacijske sustave kako 
bi "
+"se na njih mogli lakše instalirati. Izostanak binarnih datoteka programa "
+"razumljiv je ako ne postoji način izrade binarnih ili izvršnih datoteka "
+"budući da neki programski jezici ne podržavaju tu značajku, ali ljudi 
moraju "
+"imati slobodu distribuiranja takvih oblika kako bi pronašli ili razvili "
+"način njihove izrade."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Da bi te slobode bile stvarne, moraju biti trajne i neopozive sve dok ne "
-"činite neko zlo; ako razvijatelj programa ima moć opozivanja licencije ili "
-"retroaktivnog ograničavanja pravila – a da uzrok tomu nije vaše 
zlonamjerno "
-"djelovanje – program nije slobodan. "
 
 #. type: Content of: <p>
-# | However, 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
+# | [-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
 # | the rule that when redistributing the program, you cannot add restrictions
 # | to deny other people the central freedoms.  This rule does not conflict
@@ -376,12 +422,12 @@
 #| "other people the central freedoms.  This rule does not conflict with the "
 #| "central freedoms; rather it protects them."
 msgid ""
-"However, 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."
+"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."
 msgstr ""
 "Ipak, prihvatljiva su određena pravila o načinu distribuiranja slobodnog "
 "softvera sve dok nisu u sukobu s osnovnim slobodama. Na primjer, copyleft je "
@@ -430,46 +476,40 @@
 "html\">kategorije</a> slobodni softver, softver zaštićen copyleftom, ali i "
 "druge kategorije."
 
-#. type: Content of: <p>
-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>."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 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: <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 ""
-"Rezultira li izmijena poboljšanjem, subjektivna je stvar. Ako je vaše pravo 
"
-"da mijenjate program ograničeno na izmjene koje netko drugi smatra "
-"poboljšanjem, takav se program ne može smatrati slobodnim."
-
-#. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Međutim, prihvatljiva su pravila o načinu pakiranja izmijenjenih inačica 
ako "
 "ona djelotvorno ne sprječavaju vašu slobodu ustupanja izmijenjenih inačica 
"
@@ -515,6 +555,10 @@
 "postoji pogodno postrojenje za upravljanje pseudonimima koje vam dopušta da "
 "odredite ime originala kao pseudonim izmijenjene inačice."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -553,6 +597,23 @@
 "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: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Da bi te slobode bile stvarne, moraju biti trajne i neopozive sve dok ne "
+"činite neko zlo; ako razvijatelj programa ima moć opozivanja licencije ili "
+"retroaktivnog ograničavanja pravila – a da uzrok tomu nije vaše 
zlonamjerno "
+"djelovanje – program nije slobodan. "
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -575,6 +636,10 @@
 "Dozvoljeno je da slobodna licencija navodi pod koju zakonsku nadležnost "
 "ulazi, gdje bi se parnice trebale održati, ili oboje."
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -608,6 +673,10 @@
 "koje nije spomenuto ovdje kao legitimno, morali bismo posebno razmotriti i "
 "vjerojatno bismo zaključili da je riječ o neslobodnoj licenciji."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -629,6 +698,10 @@
 "translations.html\">prijevoda &ldquo;slobodnog softvera&rdquo;</a> i na "
 "razne jezike."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -656,6 +729,10 @@
 "bismo olakšali razumijevanje razloga zbog kojih se određene licencije "
 "kvalificiraju ili ne kvalificiraju."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.it.po,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -b -r1.141 -r1.142
--- po/free-sw.it.po    25 Aug 2016 22:28:17 -0000      1.141
+++ po/free-sw.it.po    16 Nov 2016 21:58:09 -0000      1.142
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-08-26 00:13+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 # type: Content of: <title>
@@ -109,6 +110,10 @@
 "philosophy/free-software-even-more-important.html\"> uno strumento di abuso</"
 "a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -187,41 +192,46 @@
 "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: <p>
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"Il resto di questa pagina chiarisce cosa significa che determinate libertà "
-"sono concesse in modo adeguato."
+"&ldquo;Software libero&rdquo; non vuol dire &ldquo;non-commerciale&rdquo;.  "
+"Un programma libero deve essere disponibile per uso commerciale, sviluppo "
+"commerciale e distribuzione commerciale.  Lo sviluppo commerciale di "
+"software libero non è più inusuale: questo software commerciale libero è "
+"molto importante. Si può ottenere software libero pagandolo o non pagandolo, 
"
+"ma, a prescindere da come lo si è ottenuto, rimane sempre la libertà di "
+"copiare e modificare il software, persino di <a href=\"/philosophy/selling."
+"it.html\">venderne copie</a>."
 
-# type: Content of: <p>
 #. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"La libertà di distribuire (libertà 2 e 3) significa che si è liberi di "
-"ridistribuire copie, con o senza modifiche, gratis o addebitando delle spese "
-"di distribuzione a <a href=\"#exportcontrol\">chiunque ed ovunque</a>.  "
-"Essere liberi di fare queste cose significa (tra l'altro) che non bisogna "
-"chiedere o pagare alcun permesso."
+"Il resto di questa pagina chiarisce cosa significa che determinate libertà "
+"sono concesse in modo adeguato."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+# type: Content of: <ul><li>
+#. type: Content of: <h4>
+# | The freedom to run the program as you [-wish, for any purpose (freedom
+# | 0).-] {+wish+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Bisogna anche avere la libertà di fare modifiche e usarle privatamente nel "
-"proprio lavoro o divertimento senza doverlo dire a nessuno. Se si pubblicano "
-"le proprie modifiche, non si deve essere tenuti a comunicarlo a qualcuno in "
-"particolare o in qualche modo particolare."
+"Libertà di eseguire il programma come si desidera, per qualsiasi scopo "
+"(libertà 0)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -254,25 +264,9 @@
 "che non ci sono divieti a farlo, e non ha nulla a che fare con quali "
 "funzioni ha il programma o se è utile per quello che si desidera fare."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"La libertà di ridistribuire copie deve includere le forme binarie o "
-"eseguibili del programma e anche il codice sorgente, sia per le versioni "
-"modificate che non modificate (distribuire programmi in formato eseguibile è 
"
-"comodo per avere sistemi operativi liberi facili da installare).  È "
-"legittimo anche se non c'è alcun modo di produrre una forma binaria o "
-"eseguibile (dal momento che alcuni linguaggi non supportano questa "
-"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: <p>
 #. type: Content of: <p>
@@ -332,6 +326,59 @@
 # type: Content of: <p>
 #. type: Content of: <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 ""
+"Se una modifica costituisca o meno un miglioramento è una questione "
+"soggettiva. Se i vostri diritti di modificare un programma sono limitati, in "
+"sostanza, a variazioni che qualcun altro considera miglioramenti, quel "
+"programma non è libero."
+
+# type: Content of: <ul><li>
+#. type: Content of: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Libertà di ridistribuire copie in modo da aiutare il prossimo       (libertà
 "
+"2)."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"La libertà di distribuire (libertà 2 e 3) significa che si è liberi di "
+"ridistribuire copie, con o senza modifiche, gratis o addebitando delle spese "
+"di distribuzione a <a href=\"#exportcontrol\">chiunque ed ovunque</a>.  "
+"Essere liberi di fare queste cose significa (tra l'altro) che non bisogna "
+"chiedere o pagare alcun permesso."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Bisogna anche avere la libertà di fare modifiche e usarle privatamente nel "
+"proprio lavoro o divertimento senza doverlo dire a nessuno. Se si pubblicano "
+"le proprie modifiche, non si deve essere tenuti a comunicarlo a qualcuno in "
+"particolare o in qualche modo particolare."
+
+# type: Content of: <p>
+#. type: Content of: <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"
@@ -348,27 +395,52 @@
 # type: Content of: <p>
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"La libertà di ridistribuire copie deve includere le forme binarie o "
+"eseguibili del programma e anche il codice sorgente, sia per le versioni "
+"modificate che non modificate (distribuire programmi in formato eseguibile è 
"
+"comodo per avere sistemi operativi liberi facili da installare).  È "
+"legittimo anche se non c'è alcun modo di produrre una forma binaria o "
+"eseguibile (dal momento che alcuni linguaggi non supportano questa "
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Queste libertà per essere reali devono essere permanenti e irrevocabili fin "
-"tanto che non si fa qualcosa di sbagliato: se lo sviluppatore del software "
-"ha il potere di revocare la licenza, o di sostituirla retroattivamente con "
-"una più restrittiva, anche senza che l'utente sia causa di tale revoca, il "
-"software non è libero."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+# | [-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.
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Tuttavia, certi tipi di regole sul come distribuire il software libero sono "
 "accettabili quando non entrano in conflitto con le libertà principali.  Per "
@@ -400,51 +472,41 @@
 "software libero&rdquo;, &ldquo;software con copyleft&rdquo; e altre "
 "categorie."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-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>."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"&ldquo;Software libero&rdquo; non vuol dire &ldquo;non-commerciale&rdquo;.  "
-"Un programma libero deve essere disponibile per uso commerciale, sviluppo "
-"commerciale e distribuzione commerciale.  Lo sviluppo commerciale di "
-"software libero non è più inusuale: questo software commerciale libero è "
-"molto importante. Si può ottenere software libero pagandolo o non pagandolo, 
"
-"ma, a prescindere da come lo si è ottenuto, rimane sempre la libertà di "
-"copiare e modificare il software, persino di <a href=\"/philosophy/selling."
-"it.html\">venderne copie</a>."
 
 # type: Content of: <p>
 #. type: Content of: <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 ""
-"Se una modifica costituisca o meno un miglioramento è una questione "
-"soggettiva. Se i vostri diritti di modificare un programma sono limitati, in "
-"sostanza, a variazioni che qualcun altro considera miglioramenti, quel "
-"programma non è libero."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Tuttavia, sono anche accettabili regole su come pacchettizzare una versione "
 "modificata, purché non limitino in modo significativo la vostra libertà di "
@@ -495,6 +557,10 @@
 "funzionalità che permetta di specificare il nome originario del programma "
 "come alias della versione modificata."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -536,6 +602,25 @@
 "sull'esportazione potrebbero rendere non banale quel requisito e quindi fare "
 "diventare non libero il software."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Queste libertà per essere reali devono essere permanenti e irrevocabili fin "
+"tanto che non si fa qualcosa di sbagliato: se lo sviluppatore del software "
+"ha il potere di revocare la licenza, o di sostituirla retroattivamente con "
+"una più restrittiva, anche senza che l'utente sia causa di tale revoca, il "
+"software non è libero."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -560,6 +645,10 @@
 "applica, o quale sede è designata per dirimere le controversie, o entrambe "
 "le cose."
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -595,6 +684,10 @@
 "fare, e non citata qui come legittima, dovremmo esaminare il caso, ma "
 "probabilmente concluderemmo che la licenza non è libera."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -616,6 +709,10 @@
 "philosophy/fs-translations.it.html\">traduzioni</a> in varie lingue "
 "dell'espressione &ldquo;software libero&rdquo;."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -644,6 +741,10 @@
 "problema, spesso aggiorniamo questi criteri per fare in modo che sia più "
 "facile capire perché determinate licenze siano adeguate o meno."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ja.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- po/free-sw.ja.po    22 Aug 2016 05:38:38 -0000      1.84
+++ po/free-sw.ja.po    16 Nov 2016 21:58:10 -0000      1.85
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-08-22 13:42+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 
 #. type: Content of: <title>
 msgid "What is free software? - GNU Project - Free Software Foundation"
@@ -100,6 +101,10 @@
 "philosophy/free-software-even-more-important.html\">不公正な力の道å…
·</a>とし"
 "ます。"
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -172,37 +177,39 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"以下では、なにが、å…
·ä½“的な自由を、十分かそうでないかとするのか、について明確"
-"にします。"
+"「自由ソフトウェア」が意味するのは、「非商用」ということではありません。自由"
+"なプログラムは商用利用や商用開発、商用é…
å¸ƒã™ã‚‹ã“とができなければなりません。"
+"自由ソフトウェアの商業的開発はもはや珍しいことではありません。そのような自由"
+"の商用ソフトウェアは極めて重要です。自由ソフトウェアのコピーを手にå
…¥ã‚Œã‚‹ã®ã«"
+"お金を払った方もいるかも知れませんし、コピーを無料で手にå
…¥ã‚ŒãŸæ–¹ã‚‚いるでしょ"
+"う。しかしどのようにしてご自分のコピーを手にå…
¥ã‚ŒãŸã‹ã«ã¯é–¢ä¿‚なく、あなたには"
+"いつでもソフトウェアをコピーし変更する自由があるのです。その自由には、<a
 "
+"href=\"/philosophy/selling.html\">コピーを売る</a>自由すら含まれます。"
 
 #. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"é…
å¸ƒã™ã‚‹è‡ªç”±(第二と第三の自由)は、変更したものもしてないものも、é
…å¸ƒæ‰‹æ•°æ–™ã‚"
-"りでもなしでも、<a 
href=\"#exportcontrol\">どこの誰にでも</a>自由に再配布する"
-"ことを意味します。これらのことをするのが自由だ
という内容には、許可を求めた"
-"り、そのためにお金を払ったりする必
要がないということも(その他のこともあわせ"
-"て)含まれています。"
+"以下では、なにが、å…
·ä½“的な自由を、十分かそうでないかとするのか、について明確"
+"にします。"
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"あなた自身の仕事や趣味においてプライベートにソフトウェアを改変し、それらを使"
-"う自由もあるべきです。プライベートな変更が存在することについて言及することさ"
-"え必
要とされずにです。もし、あなたがご自分の行った変更を発表するå
 ´åˆã§ã‚‚、特"
-"定の誰かに、もしくは何か特定の方法で、それを知らせるå¿
…要はありません。"
+"どんな目的に対しても、プログラム
を望むままに実行する自由 (第零の自由)。"
 
 #. type: Content of: <p>
 msgid ""
@@ -233,23 +240,9 @@
 "い、という意味です。プログラム
がどういった機能を有するか、または、やりたいこ"
 "とに対して有用かどうか、とは何の関係もありません。"
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"コピーを再配布する自由には、ソースコードのé…
å¸ƒã¨åŒã˜ãã€ãƒ—ログラムのバイナリ"
-"あるいは実行形式でのé…
å¸ƒã‚‚変更の有無を問わず含まれなければなりません。(実行で"
-"きる形でプログラムをé…
å¸ƒã™ã‚‹ã“とは、簡単にインストールできる自由なオペレー"
-"ティング・システムのために必要です。) 
バイナリや実行形式を作成する手段が無い"
-"とき(いくつかのプログラミング言語はこういった機能をサポートしていません)には"
-"構いませんが、後にそういった形式を作成する方法を見つけたり開発したりするかも"
-"知れませんから、そのような形式で再é…
å¸ƒã™ã‚‹è‡ªç”±ãŒãªã‘ればなりません。"
 
 #. type: Content of: <p>
 msgid ""
@@ -301,6 +294,50 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr "身近な人を助けられるよう、コピーを再é…
å¸ƒã™ã‚‹è‡ªç”± (第二の自由)。"
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"é…
å¸ƒã™ã‚‹è‡ªç”±(第二と第三の自由)は、変更したものもしてないものも、é
…å¸ƒæ‰‹æ•°æ–™ã‚"
+"りでもなしでも、<a 
href=\"#exportcontrol\">どこの誰にでも</a>自由に再配布する"
+"ことを意味します。これらのことをするのが自由だ
という内容には、許可を求めた"
+"り、そのためにお金を払ったりする必
要がないということも(その他のこともあわせ"
+"て)含まれています。"
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"あなた自身の仕事や趣味においてプライベートにソフトウェアを改変し、それらを使"
+"う自由もあるべきです。プライベートな変更が存在することについて言及することさ"
+"え必
要とされずにです。もし、あなたがご自分の行った変更を発表するå
 ´åˆã§ã‚‚、特"
+"定の誰かに、もしくは何か特定の方法で、それを知らせるå¿
…要はありません。"
+
+#. type: Content of: <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"
@@ -315,26 +352,43 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"コピーを再配布する自由には、ソースコードのé…
å¸ƒã¨åŒã˜ãã€ãƒ—ログラムのバイナリ"
+"あるいは実行形式でのé…
å¸ƒã‚‚変更の有無を問わず含まれなければなりません。(実行で"
+"きる形でプログラムをé…
å¸ƒã™ã‚‹ã“とは、簡単にインストールできる自由なオペレー"
+"ティング・システムのために必要です。) 
バイナリや実行形式を作成する手段が無い"
+"とき(いくつかのプログラミング言語はこういった機能をサポートしていません)には"
+"構いませんが、後にそういった形式を作成する方法を見つけたり開発したりするかも"
+"知れませんから、そのような形式で再é…
å¸ƒã™ã‚‹è‡ªç”±ãŒãªã‘ればなりません。"
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"これらの自由を本当のものとするためには、以上であげた自由は、あなたがなにか間"
-"違ったことをしない限り恒久
的で取り消し不能のものでなければなりません。もしソ"
-"フトウェアの開発者
に、あなたになんら落ち度がないのに、ライセンスを取り消した"
-"り遡及してその条項に制限を加
える力があれば、そのソフトウェアは自由ではありま"
-"せん。"
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "しかし、自由ソフトウェアをé…
å¸ƒã™ã‚‹æ–¹æ³•ã«ã¤ã„てのある種の規則は、それらが主要"
 "な自由と衝突しない限り容認できます。たとえば、<a 
href=\"/copyleft/copyleft."
@@ -363,47 +417,31 @@
 "いての説明は、<a 
href=\"/philosophy/categories.html\">自由ソフトウェアの分類"
 "</a>をご覧ください。"
 
-#. type: Content of: <p>
-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>."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"「自由ソフトウェア」が意味するのは、「非商用」ということではありません。自由"
-"なプログラムは商用利用や商用開発、商用é…
å¸ƒã™ã‚‹ã“とができなければなりません。"
-"自由ソフトウェアの商業的開発はもはや珍しいことではありません。そのような自由"
-"の商用ソフトウェアは極めて重要です。自由ソフトウェアのコピーを手にå
…¥ã‚Œã‚‹ã®ã«"
-"お金を払った方もいるかも知れませんし、コピーを無料で手にå
…¥ã‚ŒãŸæ–¹ã‚‚いるでしょ"
-"う。しかしどのようにしてご自分のコピーを手にå…
¥ã‚ŒãŸã‹ã«ã¯é–¢ä¿‚なく、あなたには"
-"いつでもソフトウェアをコピーし変更する自由があるのです。その自由には、<a
 "
-"href=\"/philosophy/selling.html\">コピーを売る</a>自由すら含まれます。"
 
 #. type: Content of: <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: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 
"変更されたバージョンをどのようにパッケージするかについての規則も、そういった"
 "規則が変更されたバージョンを人々
がリリースする自由や、プライベートに変更され"
@@ -450,6 +488,10 @@
 "ラム
の名前を変更版の別名として指定できるような適切なエイリアスの仕組みがある"
 "場合のみ容認できます。"
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -486,6 +528,24 @@
 
"ではなく、潜在的問題です。後日の輸出法の変更で、その要求が些細ではないものと"
 
"なり、ソフトウェアを不自由にしてしまう、ということがありうるからです。"
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"これらの自由を本当のものとするためには、以上であげた自由は、あなたがなにか間"
+"違ったことをしない限り恒久
的で取り消し不能のものでなければなりません。もしソ"
+"フトウェアの開発者
に、あなたになんら落ち度がないのに、ライセンスを取り消した"
+"り遡及してその条項に制限を加
える力があれば、そのソフトウェアは自由ではありま"
+"せん。"
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -509,6 +569,10 @@
 
"どの管轄の法律が適用されるか、あるいは訴訟が行われるå
 ´æ‰€ã€ã‚‚しくはその両方を"
 "指定することは、自由ライセンスに容認されます。"
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -541,6 +605,10 @@
 
"れについて検討しないといけないでしょうし、そのライセンスは、不自由であると結"
 "論づけるかもしれません。"
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -561,6 +629,10 @@
 "さい。また<a 
href=\"/philosophy/fs-translations.html\">「自由ソフトウェア」の"
 "各言語訳</a>の一覧もご用意しています。"
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -587,6 +659,10 @@
 
"準を更新して、あるライセンスが自由ソフトウェアのライセンスとして適æ
 ¼ã§ã‚るか"
 "どうかの理由をより簡単に理解できるようにします。"
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.lt-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.lt-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/free-sw.lt-diff.html     19 Oct 2016 14:57:36 -0000      1.1
+++ po/free-sw.lt-diff.html     16 Nov 2016 21:58:10 -0000      1.2
@@ -22,10 +22,11 @@
 &lt;!--#include virtual="/server/banner.html" --&gt;
 
 &lt;h2&gt;What is free software?&lt;/h2&gt;
-&lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
+<span class="removed"><del><strong>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</strong></del></span>
 
 &lt;h3&gt;The Free Software Definition&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 &lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
@@ -62,6 +63,8 @@
 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;
 A program is free software if the program's users have the
 four essential freedoms:
@@ -96,12 +99,23 @@
 handle some cases.  If we plan to distribute A as it stands, that
 implies users will need B, so we need to judge whether both A and B
 are free.  However, if we plan to modify A so that it doesn't use B,
-only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;</em></ins></span>
+only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;
+
+&lt;p&gt;
+&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 
+&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The rest of this page clarifies certain points about what makes
 specific freedoms adequate or not.&lt;/p&gt;
 
-&lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
+<span class="removed"><del><strong>&lt;p&gt;Freedom to distribute (freedoms 2 
and 3) means you are free to
 redistribute copies, either with or without modifications, either
 gratis or charging a fee for distribution, to
 &lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
@@ -110,11 +124,13 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-You should also have the freedom to make modifications and use them
+You should also have the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>make modifications and use them
 privately in your own work or play, without even mentioning that they
-exist.  If you do publish your changes, you should not be required to
+exist.  If you do publish your changes,</strong></del></span> <span 
class="inserted"><ins><em>run the program as</em></ins></span> you <span 
class="removed"><del><strong>should not be required to
 notify anyone in particular, or in any particular way.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>wish&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -133,16 +149,17 @@
 functionality the program has, or whether it is useful for what you
 want to do.&lt;/p&gt;
 
-&lt;p&gt;
-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
+<span class="removed"><del><strong>&lt;p&gt;
+The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>redistribute copies must include binary or 
executable
+forms of</strong></del></span> <span 
class="inserted"><ins><em>study</em></ins></span> the <span 
class="removed"><del><strong>program, as well as</strong></del></span> source 
<span class="removed"><del><strong>code, for both 
modified</strong></del></span> <span 
class="inserted"><ins><em>code</em></ins></span> and
+<span class="removed"><del><strong>unmodified versions.  (Distributing 
programs in runnable form is necessary
 for conveniently installable free operating systems.)  It is OK if there
 is no way to produce a binary or executable form for a certain program
 (since some languages don't support that feature), but you must have the
-freedom to redistribute such forms should you find or develop a way to
-make them.
-&lt;/p&gt;
+freedom to redistribute such forms should you find or develop a way 
to</strong></del></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;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -173,6 +190,29 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;h4&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
+gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist.  If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -182,15 +222,26 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-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
-restrictions to its terms, without your doing anything wrong to give
-cause, the software is not free.
+<span class="removed"><del><strong>In order for these 
freedoms</strong></del></span>
+<span class="inserted"><ins><em>The freedom</em></ins></span> to <span 
class="removed"><del><strong>be real, they</strong></del></span> <span 
class="inserted"><ins><em>redistribute copies</em></ins></span> must <span 
class="removed"><del><strong>be permanent and
+irrevocable</strong></del></span> <span class="inserted"><ins><em>include 
binary or executable
+forms of the program,</em></ins></span> as <span 
class="removed"><del><strong>long</strong></del></span> <span 
class="inserted"><ins><em>well</em></ins></span> as <span 
class="inserted"><ins><em>source code, for both modified and
+unmodified versions.  (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.)  It is OK if there
+is no way to produce a binary or executable form for a certain program
+(since some languages don't support that feature), but</em></ins></span> you 
<span class="removed"><del><strong>do nothing wrong; if the developer of the
+software has</strong></del></span> <span class="inserted"><ins><em>must 
have</em></ins></span> the <span 
class="removed"><del><strong>power</strong></del></span>
+<span class="inserted"><ins><em>freedom</em></ins></span> to <span 
class="removed"><del><strong>revoke the license,</strong></del></span> <span 
class="inserted"><ins><em>redistribute such forms should you 
find</em></ins></span> or <span class="removed"><del><strong>retroactively add
+restrictions to its terms, without your doing anything 
wrong</strong></del></span> <span class="inserted"><ins><em>develop a 
way</em></ins></span> to <span class="removed"><del><strong>give
+cause, the software is not free.</strong></del></span>
+<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>
+
 &lt;p&gt;
-However, certain kinds of rules about the manner of distributing free
+<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;
 (very simply stated) is the rule that when redistributing the program,
@@ -212,14 +263,16 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;p&gt;
+<span class="removed"><del><strong>&lt;p&gt;
 &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 
+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 
 &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
 &lt;/p&gt;
 
@@ -227,10 +280,11 @@
 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.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>distribution 
details&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
-However, rules about how to package a modified version are acceptable,
+<span class="removed"><del><strong>However, rules</strong></del></span>
+<span class="inserted"><ins><em>Rules</em></ins></span> 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 privately.
 Thus, it is acceptable for the license to require that you change the
@@ -262,6 +316,8 @@
 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>
+
 &lt;p&gt;
 Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
 and trade sanctions can constrain your freedom to distribute copies of
@@ -284,6 +340,16 @@
 software nonfree.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt;Legal considerations&lt;/h4&gt;
+
+&lt;p&gt;
+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
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+&lt;/p&gt;</em></ins></span>
+
 &lt;p&gt;
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -298,6 +364,8 @@
 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>
+
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -317,6 +385,8 @@
 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;
 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
@@ -328,6 +398,8 @@
 &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;
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -342,6 +414,8 @@
 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>
+
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
 software license, see our &lt;a href="/licenses/license-list.html"&gt;list
@@ -582,7 +656,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/10/19 14:57:36 $
+$Date: 2016/11/16 21:58:10 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/free-sw.lt.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.lt.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/free-sw.lt.po    20 Aug 2016 14:58:39 -0000      1.22
+++ po/free-sw.lt.po    16 Nov 2016 21:58:10 -0000      1.23
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-01-25 14:59+0200\n"
 "Last-Translator: Donatas Klimašauskas <address@hidden>\n"
 "Language-Team: Lithuanian <address@hidden>\n"
@@ -115,6 +115,10 @@
 "valdo tą programą; tai tokią programą paverčia <a 
href=\"/philosophy/free-"
 "software-even-more-important.html\">neteisingos galios instrumentu</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -200,6 +204,27 @@
 
 #. type: Content of: <p>
 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>."
+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: <p>
+msgid ""
 "The rest of this page clarifies certain points about what makes specific "
 "freedoms adequate or not."
 msgstr ""
@@ -207,31 +232,13 @@
 "tam tikri aspektai apie tai, kas konkrečias laisves paverčia adekvačiomis "
 "arba ne."
 
-#. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
-msgstr ""
-"Laisvė platinti (laisvės Nr. 2 ir 3) reiškia, kad jūs galite laisvai "
-"išplatinti kopijas, modifikuotas arba ne, už ačiū arba už platinimo 
mokestį, "
-"<a href=\"#exportcontrol\">bet kam, bet kur</a>.  Turint laisvę tai atlikti "
-"reiškia (tame tarpe ir kitus dalykus), kad jūs neturite atsiklausti arba "
-"sumokėti už leidimą tai atlikti."
-
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Jūs taip pat turėtumėte turėti laisvę padaryti modifikacijas ir naudoti 
jas "
-"privačiai, savo paties darbui arba žaidimui, net neužsimenant, kad jos "
-"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."
+"Laisvė leisti tą programą kaip jūs norite, bet kokiu tikslu (laisvė Nr. 
0)."
 
 #. type: Content of: <p>
 msgid ""
@@ -263,24 +270,9 @@
 "arba trukdoma taip padaryti.  Tai nesusiję su programos funkcionalumu, nei "
 "su jos naudingumu tam, ką jūs norite atlikti."
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Laisvė išplatinti kopijas turi apimti dvejetainę arba vykdomąją 
programos "
-"formas, taip pat ir abiejų versijų, modifikuotos ir nemodifikuotos, 
Å¡altinio "
-"kodus.  (Vykdomosios formos programų platinimas yra būtinas patogiai "
-"įdiegiamoms laisvoms operacinėms sistemoms.)  Jei nėra jokių būdų tam 
tikrai "
-"programai sukurti dvejetainę arba vykdomąją formą (nes kai kurios "
-"kalbos<sup><a href=\"#TransNote6\">6</a></sup> nepalaiko reikiamos "
-"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: <p>
 msgid ""
@@ -335,6 +327,52 @@
 
 #. type: Content of: <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 ""
+"Ar pakeitimas prilygsta patobulinimui yra subjektyvus reikalas.  Jei jūsų "
+"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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Laisvė išplatinti kopijas, kad jūs galėtumėte padėti savo kaimynui 
(laisvė "
+"Nr. 2)."
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Laisvė platinti (laisvės Nr. 2 ir 3) reiškia, kad jūs galite laisvai "
+"išplatinti kopijas, modifikuotas arba ne, už ačiū arba už platinimo 
mokestį, "
+"<a href=\"#exportcontrol\">bet kam, bet kur</a>.  Turint laisvę tai atlikti "
+"reiškia (tame tarpe ir kitus dalykus), kad jūs neturite atsiklausti arba "
+"sumokėti už leidimą tai atlikti."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Jūs taip pat turėtumėte turėti laisvę padaryti modifikacijas ir naudoti 
jas "
+"privačiai, savo paties darbui arba žaidimui, net neužsimenant, kad jos "
+"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: <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"
@@ -350,27 +388,44 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Laisvė išplatinti kopijas turi apimti dvejetainę arba vykdomąją 
programos "
+"formas, taip pat ir abiejų versijų, modifikuotos ir nemodifikuotos, 
Å¡altinio "
+"kodus.  (Vykdomosios formos programų platinimas yra būtinas patogiai "
+"įdiegiamoms laisvoms operacinėms sistemoms.)  Jei nėra jokių būdų tam 
tikrai "
+"programai sukurti dvejetainę arba vykdomąją formą (nes kai kurios "
+"kalbos<sup><a href=\"#TransNote6\">6</a></sup> nepalaiko reikiamos "
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Siekiant, kad šios laisvės būtų tikros, jos turi būti nuolatinės ir "
-"neatšaukiamos tol, kol jūs nedarote nieko blogo; jei programinės įrangos "
-"autorius turi galią atšaukti licenciją, arba prie jos nuostatų pridėti "
-"apribojimų retrospektyviai, be jokio jūsų blogo elgesio, kuris galėtų 
būti "
-"palaikytas priežastimi tokiems pokyčiams, tokia programinė įranga nėra "
-"laisva."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Tačiau, tam tikrų rūšių laisvos programinės įrangos platinimo 
pobūdžio "
 "taisyklės yra priimtinos, kai jos nesikerta su pagrindinėmis laisvėmis.  "
@@ -401,48 +456,31 @@
 "laisva programinė įranga&ldquo;, &bdquo;copyleft programinė įranga&ldquo; 
ir "
 "kitos programinės įrangos kategorijos yra tarpusavyje susijusios."
 
-#. type: Content of: <p>
-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>."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 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: <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 ""
-"Ar pakeitimas prilygsta patobulinimui yra subjektyvus reikalas.  Jei jūsų "
-"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: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Tačiau, taisyklės apie tai, kaip supakuoti<sup><a href=\"#TransNote9\">9</"
 "a></sup> modifikuotą versiją yra priimtinos, jei jos ženkliai neapriboja "
@@ -492,6 +530,10 @@
 "sprendimas, kuris jums sudaro galimybę nurodyti originalios programos "
 "pavadinimą, kaip modifikuotos versijos pseudonimą."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -530,6 +572,25 @@
 "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: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Siekiant, kad šios laisvės būtų tikros, jos turi būti nuolatinės ir "
+"neatšaukiamos tol, kol jūs nedarote nieko blogo; jei programinės įrangos "
+"autorius turi galią atšaukti licenciją, arba prie jos nuostatų pridėti "
+"apribojimų retrospektyviai, be jokio jūsų blogo elgesio, kuris galėtų 
būti "
+"palaikytas priežastimi tokiems pokyčiams, tokia programinė įranga nėra "
+"laisva."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -552,6 +613,10 @@
 "Laisva licencija yra priimtina nurodyti kurios jurisdikcijos teisė taikoma "
 "arba kur turi būti teisiamasi, arba abu."
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -586,6 +651,10 @@
 "paminėta legalia, mes turėsime apie tai pagalvoti ir greičiausiai 
prieisime "
 "prie išvados, kad ji yra nelaisva."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -607,6 +676,10 @@
 "sąrašą tinkamų <a href=\"/philosophy/fs-translations.html\">&bdquo;laisva 
"
 "programinė įranga&ldquo; vertimų</a> į įvairias kalbas."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -635,6 +708,10 @@
 "kriterijus, kad būtų galima lengviau įžvelgti kodėl tam tikros 
licencijos "
 "kvalifikuojamos arba ne."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.nb.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.nb.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/free-sw.nb.po    20 Aug 2016 14:58:39 -0000      1.7
+++ po/free-sw.nb.po    16 Nov 2016 21:58:10 -0000      1.8
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -100,6 +100,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 # | [-&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+}
@@ -186,53 +190,48 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-
-# | [-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
-# | modifications, either gratis or charging a fee for distribution, to <a
-# | 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.+}
+# | {+&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.-] {+software, even to <a
+# | href=\"/philosophy/selling.html\">sell copies</a>.+}
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "A program is free software if users have all of these freedoms. Thus, you "
-#| "should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
+#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"Et program er fri programvare hvis brukerne kan dra nytte av alle disse "
-"frihetene. Slik kan du kunne redistribuere kopier fritt, enten med eller "
-"uten modifikasjoner, enten gratis eller ved å ta penger for distribusjonen, "
-"til <a href=\"#exportcontrol\">hvem som helst og hvor som helst</a>. Å ha "
-"friheten til å gjøre dette betyr (bl.a) at du ikke må spørre om eller 
betale "
-"for tillatelse."
+"Du kan ha betalt penger for kopier av fri 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: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Du burde også ha friheten til å lage modifikasjoner og bruke dem privat i "
-"ditt eget arbeid eller hobby, uten å nevne at de eksisterer. Hvis du gir ut "
-"forandringene, skal du ikke være nødt til å underrette noen som helst, på 
"
-"noen som helst måte."
+
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
+msgstr ""
+"Friheten til å kjøre programmet som du ønsker, uansett hensikt (frihet 0)."
 
 #. type: Content of: <p>
 msgid ""
@@ -253,15 +252,8 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
 
 #. type: Content of: <p>
@@ -296,6 +288,64 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Friheten til å redistribuere kopier så du kan hjelpe din neste (frihet 2)."
+
+# | [-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
+# | modifications, either gratis or charging a fee for distribution, to <a
+# | 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: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms. Thus, you "
+#| "should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Et program er fri programvare hvis brukerne kan dra nytte av alle disse "
+"frihetene. Slik kan du kunne redistribuere kopier fritt, enten med eller "
+"uten modifikasjoner, enten gratis eller ved å ta penger for distribusjonen, "
+"til <a href=\"#exportcontrol\">hvem som helst og hvor som helst</a>. Å ha "
+"friheten til å gjøre dette betyr (bl.a) at du ikke må spørre om eller 
betale "
+"for tillatelse."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Du burde også ha friheten til å lage modifikasjoner og bruke dem privat i "
+"ditt eget arbeid eller hobby, uten å nevne at de eksisterer. Hvis du gir ut "
+"forandringene, skal du ikke være nødt til å underrette noen som helst, på 
"
+"noen som helst måte."
+
+#. type: Content of: <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"
@@ -303,28 +353,20 @@
 "to be nonfree does not qualify as a free license."
 msgstr ""
 
-# | 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
-# | restrictions to its terms,+} without your doing anything {+wrong+} to give
-# | cause, the software is not free.
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, without your doing anything to give cause, the "
-#| "software is not free."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"For at disse frihetene skal realiseres, kan de ikke forandres så lenge du "
-"ikke gjør noe galt; hvis utvikleren av programvaren har makten til å fjerne 
"
-"lisensen, selv om du ikke har grunnlag, blir programvaren ufri."
 
 # | However, certain kinds of rules about the manner of distributing free
 # | software are acceptable, when they don't conflict with the central
@@ -343,12 +385,12 @@
 #| "restrictions to deny other people the central freedoms.  This rule does "
 #| "not conflict with the central freedoms; rather it protects them."
 msgid ""
-"However, 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."
+"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."
 msgstr ""
 " Likevel er det noen regler om oppførsel av å distribuere fri programvare "
 "som er akseptable når de ikke er i konflikt med sentrale friheter. For "
@@ -378,40 +420,8 @@
 "beskrivelse om hvordan «fri programvare», «copylefted programvare» og 
andre "
 "kategorier og andre programvarekategorier er beslektet."
 
-# | {+&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.-] {+software, even to <a
-# | href=\"/philosophy/selling.html\">sell copies</a>.+}
-#. type: Content of: <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."
-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>."
-msgstr ""
-"Du kan ha betalt penger for kopier av fri 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: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 # | [-Rules-]{+However, rules+} about how to package a modified version are
@@ -437,15 +447,14 @@
 #| "condition.  (Note that such a rule still leaves you the choice of whether "
 #| "to publish the program or not.)"
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Regler om hvordan man lager en package (pakke) av en modifisert versjon er "
 "akseptable, hvis de ikke blokkerer din frihet til å utgi modifiserte "
@@ -476,6 +485,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # | 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
@@ -524,6 +537,33 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# | 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
+# | restrictions to its terms,+} without your doing anything {+wrong+} to give
+# | cause, the software is not free.
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, without your doing anything to give cause, the "
+#| "software is not free."
+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 "
+"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."
+msgstr ""
+"For at disse frihetene skal realiseres, kan de ikke forandres så lenge du "
+"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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -539,6 +579,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -559,6 +603,10 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # | 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
@@ -598,6 +646,10 @@
 "philosophy/fs-translations.html\"> oversettelser av «fri programvare»</a> "
 "til flere språk."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -613,6 +665,10 @@
 "licenses do or don't qualify."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.nl.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- po/free-sw.nl.po    21 Sep 2016 18:58:32 -0000      1.35
+++ po/free-sw.nl.po    16 Nov 2016 21:58:10 -0000      1.36
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <address@hidden>\n"
 "Language-Team: Dutch\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
 #. type: Content of: <title>
@@ -102,6 +103,10 @@
 "het programma; dit maakt het programma <a href=\"/philosophy/free-software-"
 "even-more-important.html\"> een instrument van onrechtvaardige macht</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -178,38 +183,42 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"De rest van deze pagina verduidelijkt enkele punten, zodat het duidelijk is "
-"of bepaalde vrijheden adequaat zijn."
+"&ldquo;Vrije software&rdquo; betekent niet &ldquo;non-commercieel&rdquo;. "
+"Een vrij programma is ook beschikbaar voor commercieel gebruik, "
+"commerci&euml;le ontwikkeling en verspreiding. Ontwikkeling van vrije "
+"software op commerci&euml;le basis is gemeengoed geworden en heel "
+"belangrijk. Of je nu betaald hebt voor vrije software, of dat je het gratis "
+"ontvangen hebt, je hebt altijd het recht om deze software te kopi&euml;ren "
+"en te veranderen zelfs om <a href=\"/philosophy/selling.html\">kopieën te "
+"verkopen</a>."
 
 #. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"De vrijheid om een programma te verspreiden (vrijheden 2 en 3) betekent dat "
-"je vrij bent om kopie&euml;n te verspreiden, met of zonder veranderingen, "
-"gratis of voor een vergoeding voor de distributie en aan <a href="
-"\"#exportcontrol\">iedereen, overal</a>. Vrij zijn betekent ook dat je "
-"niemand  toestemming hoeft te vragen of te betalen wanneer je deze dingen "
-"wil doen."
+"De rest van deze pagina verduidelijkt enkele punten, zodat het duidelijk is "
+"of bepaalde vrijheden adequaat zijn."
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+# | The freedom to run the program as you [-wish, for any purpose (freedom
+# | 0).-] {+wish+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Je zou ook de vrijheid moeten hebben om veranderingen aan te brengen voor "
-"eigen gebruik, zonder zelfs maar te hoeven vertellen dat je ze gemaakt hebt. "
-"Als je de veranderingen vrijgeeft, ben je niet verplicht om dat aan iemand "
-"te melden."
+"De vrijheid om het programma te gebruiken zoals jij dat wilt, voor elk doel "
+"(vrijheid 0)."
 
 #. type: Content of: <p>
 msgid ""
@@ -242,25 +251,9 @@
 "functionaliteit die het programma heeft, of met hoe nuttig het is voor wat "
 "je wil doen. "
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Deze vrijheid om te kopi&euml;ren mag niet beperkt worden tot alleen de "
-"uitvoerbare versie van het programma maar moet ook voor de broncode gelden, "
-"voor zowel exacte kopie&euml;n als ook veranderde versies. (Het uitbrengen "
-"van programmatuur in uitvoerbare versies is handig voor installeerbare "
-"besturingssystemen.) Het is prima wanneer er van een programma geen "
-"executeerbare versie kan worden gemaakt (sommige programmeertalen "
-"ondersteunen zoiets niet), maar je moet wel de vrijheid hebben om iets "
-"dergelijks te kunnen distribueren wanneer je een methode ontwikkelt of vindt "
-"om dit toch te doen."
 
 #. type: Content of: <p>
 msgid ""
@@ -311,6 +304,55 @@
 
 #. type: Content of: <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 ""
+"Of een verandering ook een verbetering is, is subjectief. Wanneer "
+"veranderingen alleen zijn toegestaan als anderen die veranderingen als "
+"verbetering beschouwen, is dat geen vrijheid."
+
+#. type: Content of: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"De vrijheid om het programma te verspreiden, zodat je je naasten kan helpen "
+"(vrijheid 2)."
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"De vrijheid om een programma te verspreiden (vrijheden 2 en 3) betekent dat "
+"je vrij bent om kopie&euml;n te verspreiden, met of zonder veranderingen, "
+"gratis of voor een vergoeding voor de distributie en aan <a href="
+"\"#exportcontrol\">iedereen, overal</a>. Vrij zijn betekent ook dat je "
+"niemand  toestemming hoeft te vragen of te betalen wanneer je deze dingen "
+"wil doen."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Je zou ook de vrijheid moeten hebben om veranderingen aan te brengen voor "
+"eigen gebruik, zonder zelfs maar te hoeven vertellen dat je ze gemaakt hebt. "
+"Als je de veranderingen vrijgeeft, ben je niet verplicht om dat aan iemand "
+"te melden."
+
+#. type: Content of: <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"
@@ -326,26 +368,52 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Deze vrijheid om te kopi&euml;ren mag niet beperkt worden tot alleen de "
+"uitvoerbare versie van het programma maar moet ook voor de broncode gelden, "
+"voor zowel exacte kopie&euml;n als ook veranderde versies. (Het uitbrengen "
+"van programmatuur in uitvoerbare versies is handig voor installeerbare "
+"besturingssystemen.) Het is prima wanneer er van een programma geen "
+"executeerbare versie kan worden gemaakt (sommige programmeertalen "
+"ondersteunen zoiets niet), maar je moet wel de vrijheid hebben om iets "
+"dergelijks te kunnen distribueren wanneer je een methode ontwikkelt of vindt "
+"om dit toch te doen."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Om het echte vrijheden te laten zijn, moeten ze dus ook permanent en "
-"onherroepelijk zijn zolang je niets fout doet. Wanneer de ontwikkelaar van "
-"de software de macht heeft om de licentie in te trekken, of om met "
-"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: <p>
-msgid ""
-"However, 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."
+# | [-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.
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Echter, bepaalde beperkingen op de manier waarop vrije software wordt "
 "verspreid zijn acceptabel, wanneer ze de basisvrijheden niet beperken. "
@@ -375,47 +443,40 @@
 "&ldquo;auteursplichtige software&rdquo; en andere soorten software zich tot "
 "elkaar verhouden."
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"&ldquo;Vrije software&rdquo; betekent niet &ldquo;non-commercieel&rdquo;. "
-"Een vrij programma is ook beschikbaar voor commercieel gebruik, "
-"commerci&euml;le ontwikkeling en verspreiding. Ontwikkeling van vrije "
-"software op commerci&euml;le basis is gemeengoed geworden en heel "
-"belangrijk. Of je nu betaald hebt voor vrije software, of dat je het gratis "
-"ontvangen hebt, je hebt altijd het recht om deze software te kopi&euml;ren "
-"en te veranderen zelfs om <a href=\"/philosophy/selling.html\">kopieën te "
-"verkopen</a>."
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"Of een verandering ook een verbetering is, is subjectief. Wanneer "
-"veranderingen alleen zijn toegestaan als anderen die veranderingen als "
-"verbetering beschouwen, is dat geen vrijheid."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Beperkingen en richtlijnen over hoe je een veranderde versie weer uitbrengt "
 "zijn acceptabel, vooropgesteld dat ze het recht om die versies uit te "
@@ -460,6 +521,10 @@
 "Hierdoor kun je het origineel niet vervangen. Dit is alleen acceptabel "
 "wanneer er een configuratiesysteem is wat dit mogelijk maakt."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -499,6 +564,24 @@
 "van exportwetten in de toekomst de vereiste realistisch maakt en dus de "
 "software niet-vrij zou maken."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Om het echte vrijheden te laten zijn, moeten ze dus ook permanent en "
+"onherroepelijk zijn zolang je niets fout doet. Wanneer de ontwikkelaar van "
+"de software de macht heeft om de licentie in te trekken, of om met "
+"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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -522,6 +605,10 @@
 "Het is acceptabel als een vrije licentie aangeeft welke wetgeving van "
 "toepassing is, of waar rechtszaken moeten worden gehouden, of beide."
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -555,6 +642,10 @@
 "genoemd als acceptabel, dan zullen we hierover na moeten denken maar de "
 "conclusie zal hoogstwaarschijnlijk zijn dat het niet-vrij is."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -575,6 +666,10 @@
 "lijst van <a href=\"/philosophy/fs-translations.html\">Vertalingen van de "
 "term &ldquo;vrije software&rdquo;</a>"
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -599,6 +694,10 @@
 "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: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.pl-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pl-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/free-sw.pl-diff.html     19 Oct 2016 14:57:36 -0000      1.3
+++ po/free-sw.pl-diff.html     16 Nov 2016 21:58:10 -0000      1.4
@@ -22,10 +22,11 @@
 &lt;!--#include virtual="/server/banner.html" --&gt;
 
 &lt;h2&gt;What is free software?&lt;/h2&gt;
-&lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
+<span class="removed"><del><strong>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</strong></del></span>
 
 &lt;h3&gt;The Free Software Definition&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 &lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
@@ -62,6 +63,8 @@
 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;
 A program is free software if the program's users have the
 four essential freedoms:
@@ -96,12 +99,23 @@
 handle some cases.  If we plan to distribute A as it stands, that
 implies users will need B, so we need to judge whether both A and B
 are free.  However, if we plan to modify A so that it doesn't use B,
-only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;</em></ins></span>
+only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;
+
+&lt;p&gt;
+&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 
+&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The rest of this page clarifies certain points about what makes
 specific freedoms adequate or not.&lt;/p&gt;
 
-&lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
+<span class="removed"><del><strong>&lt;p&gt;Freedom to distribute (freedoms 2 
and 3) means you are free to
 redistribute copies, either with or without modifications, either
 gratis or charging a fee for distribution, to
 &lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
@@ -110,11 +124,13 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-You should also have the freedom to make modifications and use them
+You should also have the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>make modifications and use them
 privately in your own work or play, without even mentioning that they
-exist.  If you do publish your changes, you should not be required to
+exist.  If you do publish your changes,</strong></del></span> <span 
class="inserted"><ins><em>run the program as</em></ins></span> you <span 
class="removed"><del><strong>should not be required to
 notify anyone in particular, or in any particular way.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>wish&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -133,16 +149,17 @@
 functionality the program has, or whether it is useful for what you
 want to do.&lt;/p&gt;
 
-&lt;p&gt;
-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
+<span class="removed"><del><strong>&lt;p&gt;
+The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>redistribute copies must include binary or 
executable
+forms of</strong></del></span> <span 
class="inserted"><ins><em>study</em></ins></span> the <span 
class="removed"><del><strong>program, as well as</strong></del></span> source 
<span class="removed"><del><strong>code, for both 
modified</strong></del></span> <span 
class="inserted"><ins><em>code</em></ins></span> and
+<span class="removed"><del><strong>unmodified versions.  (Distributing 
programs in runnable form is necessary
 for conveniently installable free operating systems.)  It is OK if there
 is no way to produce a binary or executable form for a certain program
 (since some languages don't support that feature), but you must have the
-freedom to redistribute such forms should you find or develop a way to
-make them.
-&lt;/p&gt;
+freedom to redistribute such forms should you find or develop a way 
to</strong></del></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;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -173,6 +190,29 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;h4&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
+gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist.  If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -182,15 +222,26 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-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
-restrictions to its terms, without your doing anything wrong to give
-cause, the software is not free.
+<span class="removed"><del><strong>In order for these 
freedoms</strong></del></span>
+<span class="inserted"><ins><em>The freedom</em></ins></span> to <span 
class="removed"><del><strong>be real, they</strong></del></span> <span 
class="inserted"><ins><em>redistribute copies</em></ins></span> must <span 
class="removed"><del><strong>be permanent and
+irrevocable</strong></del></span> <span class="inserted"><ins><em>include 
binary or executable
+forms of the program,</em></ins></span> as <span 
class="removed"><del><strong>long</strong></del></span> <span 
class="inserted"><ins><em>well</em></ins></span> as <span 
class="inserted"><ins><em>source code, for both modified and
+unmodified versions.  (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.)  It is OK if there
+is no way to produce a binary or executable form for a certain program
+(since some languages don't support that feature), but</em></ins></span> you 
<span class="removed"><del><strong>do nothing wrong; if the developer of the
+software has</strong></del></span> <span class="inserted"><ins><em>must 
have</em></ins></span> the <span 
class="removed"><del><strong>power</strong></del></span>
+<span class="inserted"><ins><em>freedom</em></ins></span> to <span 
class="removed"><del><strong>revoke the license,</strong></del></span> <span 
class="inserted"><ins><em>redistribute such forms should you 
find</em></ins></span> or <span class="removed"><del><strong>retroactively add
+restrictions to its terms, without your doing anything 
wrong</strong></del></span> <span class="inserted"><ins><em>develop a 
way</em></ins></span> to <span class="removed"><del><strong>give
+cause, the software is not free.</strong></del></span>
+<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>
+
 &lt;p&gt;
-However, certain kinds of rules about the manner of distributing free
+<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;
 (very simply stated) is the rule that when redistributing the program,
@@ -212,14 +263,16 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;p&gt;
+<span class="removed"><del><strong>&lt;p&gt;
 &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 
+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 
 &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
 &lt;/p&gt;
 
@@ -227,10 +280,11 @@
 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.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>distribution 
details&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
-However, rules about how to package a modified version are acceptable,
+<span class="removed"><del><strong>However, rules</strong></del></span>
+<span class="inserted"><ins><em>Rules</em></ins></span> 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 privately.
 Thus, it is acceptable for the license to require that you change the
@@ -262,6 +316,8 @@
 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>
+
 &lt;p&gt;
 Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
 and trade sanctions can constrain your freedom to distribute copies of
@@ -284,6 +340,16 @@
 software nonfree.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt;Legal considerations&lt;/h4&gt;
+
+&lt;p&gt;
+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
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+&lt;/p&gt;</em></ins></span>
+
 &lt;p&gt;
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -298,6 +364,8 @@
 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>
+
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -317,6 +385,8 @@
 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;
 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
@@ -328,6 +398,8 @@
 &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;
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -342,6 +414,8 @@
 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>
+
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
 software license, see our &lt;a href="/licenses/license-list.html"&gt;list
@@ -582,7 +656,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/10/19 14:57:36 $
+$Date: 2016/11/16 21:58:10 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/free-sw.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pl.po,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- po/free-sw.pl.po    20 Aug 2016 14:58:40 -0000      1.87
+++ po/free-sw.pl.po    16 Nov 2016 21:58:10 -0000      1.88
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-01-29 20:24-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -127,6 +127,10 @@
 "niewolny lub&nbsp;&bdquo;własnościowy&rdquo; [<em>ang. proprietary</em>] "
 "program jest narzędziem niesprawiedliwej władzy."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -219,39 +223,43 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"Reszta tej strony wyjaśnia kilka szegółów decydujących czy&nbsp;dana 
wolność "
-"jest wystarczająca."
+"&bdquo;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: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Wolność rozpowszechniania (wolności 2 i&nbsp;3) znaczy, 
że&nbsp;powinniście "
-"mieć swobodę rozpowszechniania kopii, zmodyfikowanych bądź&nbsp;"
-"oryginalnych, za&nbsp;darmo bądź&nbsp;pobierając opłatę 
za&nbsp;dystrybucję, "
-"<a href=\"#exportcontrol\">wszędzie i&nbsp;każdemu</a>. Wolność robienia "
-"tego wszystkiego oznacza (między innymi), że&nbsp;nie musicie prosić o "
-"pozwolenie ani&nbsp;płacić za&nbsp;nie."
+"Reszta tej strony wyjaśnia kilka szegółów decydujących czy&nbsp;dana 
wolność "
+"jest wystarczająca."
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+# | The freedom to run the program as you [-wish, for any purpose (freedom
+# | 0).-] {+wish+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Powinniście mieć również wolność dokonywania zmian w&nbsp;programie 
i&nbsp;"
-"wykorzystywania ich prywatnie w&nbsp;pracy czy&nbsp;też dla rozrywki, "
-"bez&nbsp;wspominania nawet, że&nbsp;istnieją. A&nbsp;jeśli już 
opublikujecie "
-"dokonane modyfikacje, nie powinniście być zmuszeni do&nbsp;powiadamiania o "
-"tym kogokolwiek, w&nbsp;jakikolwiek sposób."
+"Wolność do&nbsp;uruchamiania programu jak chcecie, w&nbsp;dowolnym celu "
+"(wolność 0)."
 
 #. type: Content of: <p>
 msgid ""
@@ -285,25 +293,9 @@
 "z&nbsp;funkcjonalnością programu ani&nbsp;czy program robi to, co chcecie "
 "aby&nbsp;robił."
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Wolność do&nbsp;redystrybucji kopii programu musi obejmować zarówno 
postaci "
-"binarne czy&nbsp;wykonywalne programu, jak i&nbsp;kod źródłowy, zarówno 
dla "
-"zmienionych, jak i&nbsp;niezmienionych wersji. (Rozpowszechnianie programów "
-"w&nbsp;postaci gotowej do&nbsp;uruchomienia jest konieczne dla zachowania "
-"wygody instalacji wolnych systemów operacyjnych). Nie szkodzi, jeśli nie da 
"
-"się utworzyć postaci binarnej czy&nbsp;wykonywalnej (ponieważ w&nbsp;"
-"niektórych językach programowania nie ma takiej możliwości), mimo to 
musicie "
-"mieć wolność do&nbsp;rozpowszechniania takich postaci, jeśli znajdziecie "
-"metodę ich utworzenia."
 
 #. type: Content of: <p>
 msgid ""
@@ -358,6 +350,56 @@
 
 #. type: Content of: <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 ""
+"To, czy&nbsp;zmiana stanowi udoskonalenie, jest kwestią subiektywną. Jeśli 
"
+"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: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Wolność do&nbsp;rozpowszechniania kopii, byście mogli pomóc innym ludziom 
"
+"(wolność 2)."
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Wolność rozpowszechniania (wolności 2 i&nbsp;3) znaczy, 
że&nbsp;powinniście "
+"mieć swobodę rozpowszechniania kopii, zmodyfikowanych bądź&nbsp;"
+"oryginalnych, za&nbsp;darmo bądź&nbsp;pobierając opłatę 
za&nbsp;dystrybucję, "
+"<a href=\"#exportcontrol\">wszędzie i&nbsp;każdemu</a>. Wolność robienia "
+"tego wszystkiego oznacza (między innymi), że&nbsp;nie musicie prosić o "
+"pozwolenie ani&nbsp;płacić za&nbsp;nie."
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Powinniście mieć również wolność dokonywania zmian w&nbsp;programie 
i&nbsp;"
+"wykorzystywania ich prywatnie w&nbsp;pracy czy&nbsp;też dla rozrywki, "
+"bez&nbsp;wspominania nawet, że&nbsp;istnieją. A&nbsp;jeśli już 
opublikujecie "
+"dokonane modyfikacje, nie powinniście być zmuszeni do&nbsp;powiadamiania o "
+"tym kogokolwiek, w&nbsp;jakikolwiek sposób."
+
+#. type: Content of: <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"
@@ -373,26 +415,52 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Wolność do&nbsp;redystrybucji kopii programu musi obejmować zarówno 
postaci "
+"binarne czy&nbsp;wykonywalne programu, jak i&nbsp;kod źródłowy, zarówno 
dla "
+"zmienionych, jak i&nbsp;niezmienionych wersji. (Rozpowszechnianie programów "
+"w&nbsp;postaci gotowej do&nbsp;uruchomienia jest konieczne dla zachowania "
+"wygody instalacji wolnych systemów operacyjnych). Nie szkodzi, jeśli nie da 
"
+"się utworzyć postaci binarnej czy&nbsp;wykonywalnej (ponieważ w&nbsp;"
+"niektórych językach programowania nie ma takiej możliwości), mimo to 
musicie "
+"mieć wolność do&nbsp;rozpowszechniania takich postaci, jeśli znajdziecie "
+"metodę ich utworzenia."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Aby&nbsp;wszystkie te wolności nabrały rzeczywistego wymiaru, muszą być "
-"nieodwołalne tak długo, jak nie robicie niczego złego. Jeżeli&nbsp;autor "
-"oprogramowania ma prawo unieważnienia licencji, bądź&nbsp;wstecznego 
dodania "
-"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: <p>
-msgid ""
-"However, 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."
+# | [-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.
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Jednakże pewne rodzaje zasad dotyczących sposobu rozpowszechniania wolnego "
 "oprogramowania są akceptowalne, pod&nbsp;warunkiem, że&nbsp;nie stoją 
w&nbsp;"
@@ -423,48 +491,40 @@
 "href=\"/philosophy/categories.html\">Kategorie wolnego i&nbsp;niewolnego "
 "oprogramowania</a>."
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"&bdquo;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: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"To, czy&nbsp;zmiana stanowi udoskonalenie, jest kwestią subiektywną. Jeśli 
"
-"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: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Ustalanie reguł tworzenia pakietu ze zmienioną wersją jest dopuszczalne, "
 "jeśli tylko owe reguły w&nbsp;istotny sposób nie ograniczają Waszej 
wolności "
@@ -512,6 +572,10 @@
 "tylko jeśli jest prosty sposób wyznaczenia aliasu aby&nbsp;zmodyfikowana "
 "wersja mogła być wywoływana przez alias oryginalnej."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -552,6 +616,24 @@
 "zmiana w&nbsp;przepisach eksportu sprawią, że&nbsp;wymóg jest nietrywialny 
"
 "a&nbsp;oprogramowanie stanie się niewolne."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Aby&nbsp;wszystkie te wolności nabrały rzeczywistego wymiaru, muszą być "
+"nieodwołalne tak długo, jak nie robicie niczego złego. Jeżeli&nbsp;autor "
+"oprogramowania ma prawo unieważnienia licencji, bądź&nbsp;wstecznego 
dodania "
+"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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -575,6 +657,10 @@
 "obowiązuje, lub&nbsp;gdzie powinien być złożony pozew sądowy, 
lub&nbsp;jedno "
 "i&nbsp;drugie."
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -612,6 +698,10 @@
 "musieli to przemyśleć i&nbsp;zapewne dojdziemy do&nbsp;wniosku, 
że&nbsp;nie "
 "jest wolna."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -633,6 +723,10 @@
 "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: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -662,6 +756,10 @@
 "często uaktualniamy powyższe kryteria, by wyjaśnić, dlaczego pewne 
licencje "
 "kwalifikują się bądź&nbsp;nie."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.pot
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pot,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- po/free-sw.pot      20 Aug 2016 14:58:40 -0000      1.59
+++ po/free-sw.pot      16 Nov 2016 21:58:10 -0000      1.60
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -75,6 +75,10 @@
 "of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -127,25 +131,24 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
 
 #. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+msgid "The freedom to run the program as you wish"
 msgstr ""
 
 #. type: Content of: <p>
@@ -167,15 +170,8 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
 
 #. type: Content of: <p>
@@ -210,6 +206,34 @@
 
 #. type: Content of: <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: <h4>
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+
+#. type: Content of: <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 "
@@ -220,21 +244,27 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"However, 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."
+"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."
 msgstr ""
 
 #. type: Content of: <p>
@@ -249,36 +279,20 @@
 "software&rdquo; and other categories of software relate to each other."
 msgstr ""
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 #. type: Content of: <p>
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 
 #. type: Content of: <p>
@@ -303,6 +317,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -326,6 +344,19 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -341,6 +372,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -361,6 +396,10 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -373,6 +412,10 @@
 "&ldquo;free software&rdquo;</a> into various languages."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -388,6 +431,10 @@
 "licenses do or don't qualify."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.pt-br.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.pt-br.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- po/free-sw.pt-br.po 11 Oct 2016 07:58:23 -0000      1.33
+++ po/free-sw.pt-br.po 16 Nov 2016 21:58:10 -0000      1.34
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-10-10 09:08-0300\n"
 "Last-Translator: Rafael Fontenelle <address@hidden>\n"
 "Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -17,6 +17,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Brazilian Portuguese\n"
@@ -106,6 +107,10 @@
 "não-livre e “proprietário” é, portanto, <a 
href=\"/philosophy/free-software-"
 "even-more-important.html\">um instrumento de poder injusto</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -183,37 +188,40 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"O resto dessa página clarifica certos pontos sobre o que faz liberdades "
-"específicas adequadas ou não."
+"“Software livre” não significa “não comercial”. Um programa livre 
deve estar "
+"disponível para uso comercial, desenvolvimento comercial e distribuição "
+"comercial. Desenvolvimento comercial de software livre deixou de ser "
+"incomum; tais software livre comerciais são muito importantes. 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: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Liberdade para distribuir (liberdades 2 e 3) significam que você é livre "
-"para redistribuir cópias, modificadas ou não, gratuitamente ou cobrando uma 
"
-"taxa pela distribuição, a <a href=\"#exportcontrol\">qualquer um, em "
-"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."
+"O resto dessa página clarifica certos pontos sobre o que faz liberdades "
+"específicas adequadas ou não."
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Você também deve ter a liberdade de fazer modificações e usá-las "
-"privativamente ou em seu trabalho ou lazer, sem sequer mencionar que eles "
-"existem. Se publicar suas modificações, você não deve ser obrigado a 
avisar "
-"ninguém em particular, ou de qualquer modo em particular."
+"A liberdade de executar o programa como você desejar, para qualquer "
+"propósito (liberdade 0)."
 
 #. type: Content of: <p>
 msgid ""
@@ -247,24 +255,9 @@
 "funcionalidade o programa possui, ou se ele é útil para o que você quer "
 "fazer."
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"A liberdade de redistribuir cópias deve incluir formas executáveis ou "
-"binárias do programa, bem como o código-fonte, tanto da versão modificada "
-"quanto da inalterada. (Distribuir programas em formato executável é "
-"necessário para sistemas operacionais livres e convenientemente "
-"instaláveis.) Não há problemas se não for possível produzir uma forma "
-"binária ou executável (pois algumas linguagens de programação não 
suportam "
-"este recurso), mas deve ser concedida a liberdade de se redistribuir nessas "
-"formas caso seja desenvolvido um meio de criá-las."
 
 #. type: Content of: <p>
 msgid ""
@@ -316,6 +309,53 @@
 
 #. type: Content of: <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 ""
+"Se uma modificação constitui ou não um aperfeiçoamento é uma questão "
+"subjetiva. Se o seu direito de modificar um programa é limitado, "
+"fundamentalmente, a mudanças que outra pessoa considere um aperfeiçoamento, 
"
+"o programa não é livre."
+
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"A liberdade de redistribuir cópias de modo que você possa ajudar ao 
próximo "
+"(liberdade 2)."
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Liberdade para distribuir (liberdades 2 e 3) significam que você é livre "
+"para redistribuir cópias, modificadas ou não, gratuitamente ou cobrando uma 
"
+"taxa pela distribuição, a <a href=\"#exportcontrol\">qualquer um, em "
+"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: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Você também deve ter a liberdade de fazer modificações e usá-las "
+"privativamente ou em seu trabalho ou lazer, sem sequer mencionar que eles "
+"existem. 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: <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"
@@ -330,26 +370,44 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"A liberdade de redistribuir cópias deve incluir formas executáveis ou "
+"binárias do programa, bem como o código-fonte, tanto da versão modificada "
+"quanto da inalterada. (Distribuir programas em formato executável é "
+"necessário para sistemas operacionais livres e convenientemente "
+"instaláveis.) Não há problemas se não for possível produzir uma forma "
+"binária ou executável (pois algumas linguagens de programação não 
suportam "
+"este recurso), mas deve ser concedida a liberdade de se redistribuir nessas "
+"formas caso seja desenvolvido um meio de criá-las."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Para que essas liberdades sejam reais, elas devem ser permanentes e "
-"irrevogáveis desde que você não faça nada de errado; se o desenvolvedor 
do "
-"software tiver o poder de revogar a licença, ou adicionar restrições "
-"retroativamente a seus termos, sem que você faça nada errado para dar um "
-"motivo, o software não é livre."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Todavia, certas regras sobre a maneira de distribuir o software são "
 "aceitáveis, quando elas não entram em conflito com as liberdades centrais. "
@@ -379,48 +437,31 @@
 "uma descrição de como “software livre” e “copylefted software” e 
outras "
 "categorias de software se relacionam umas com as outras."
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"“Software livre” não significa “não comercial”. Um programa livre 
deve estar "
-"disponível para uso comercial, desenvolvimento comercial e distribuição "
-"comercial. Desenvolvimento comercial de software livre deixou de ser "
-"incomum; tais software livre comerciais são muito importantes. 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: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"Se uma modificação constitui ou não um aperfeiçoamento é uma questão "
-"subjetiva. Se o seu direito de modificar um programa é limitado, "
-"fundamentalmente, a mudanças que outra pessoa considere um aperfeiçoamento, 
"
-"o programa não é livre."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "No entanto, regras sobre como empacotar uma versão modificada são "
 "aceitáveis, se elas não limitam substantivamente sua liberdade de liberar "
@@ -468,6 +509,10 @@
 "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: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -508,6 +553,24 @@
 "lei de exportação poderia tornar os requerimentos em não-triviais e, "
 "portanto, tornar o software não-livre."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Para que essas liberdades sejam reais, elas devem ser permanentes e "
+"irrevogáveis desde que você não faça nada de errado; se o desenvolvedor 
do "
+"software tiver o poder de revogar a licença, ou adicionar restrições "
+"retroativamente a seus termos, sem que você faça nada errado para dar um "
+"motivo, o software não é livre."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -530,6 +593,10 @@
 "É 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: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -564,6 +631,10 @@
 "teremos que pensar sobre isso, e provavelmente iremos concluir que ela é 
não-"
 "livre."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -584,6 +655,10 @@
 "translations.html\">traduções apropriadas de “free software”</a> em 
várias "
 "línguas."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -611,6 +686,10 @@
 "frequentemente atualizamos estes critérios para tornar mais fácil 
determinar "
 "se uma certa licença se qualifica ou não."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.ro.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ro.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/free-sw.ro.po    20 Aug 2016 14:58:40 -0000      1.7
+++ po/free-sw.ro.po    16 Nov 2016 21:58:10 -0000      1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free.sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -102,6 +102,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -181,46 +185,48 @@
 msgstr ""
 
 #. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-
-#. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "A program is free software if users have all of these freedoms. Thus, you "
-#| "should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
+#| "&ldquo;Free software&rdquo; does not mean &ldquo;non-commercial&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. 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 ""
-"Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
-"copies, either with or without modifications, either gratis or charging a "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"Un program este software liber dacă întrunește toate aceste libertăți. "
-"Astfel, ar trebui să fiți liberi să redistribuiți copii, modificate sau 
nu, "
-"gratuit sau contra unei sume pentru costurile de desfacere, <a href="
-"\"#exportcontrol\">oricui, oriunde</a>. Libertatea de a face aceste lucruri "
-"înseamnă (printre altele) că nu e necesar să cereți sau să plătiți 
pentru a "
-"primi permisiune în acest scop."
+"„Software liber” nu înseamnă „non-comercial”. Un program liber 
trebuie să "
+"fie utilizabil în scop comercial, și disponibil pentru dezvoltare și "
+"distribuție comercială. Dezvoltarea comercială a software-ului liber nu 
mai "
+"este ceva neobișnuit; iar software-ul comercial liber este foarte important. 
"
+"Astfel, se poate întâmpla să plătiți pentru a dobândi cópii ale unor "
+"programe GNU, ori, la fel de bine, puteți obține cópii 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 href=\"/philosophy/selling.html"
+"\">a vinde cópii</a> ale acestora."
 
 #. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Trebuie de asemenea să aveți libertatea de a face modificări și de a le "
-"folosi pentru uz personal, cu titlu profesional sau în scop recreativ, 
fără "
-"a menționa cuiva că aceste modificări există. Dacă totuși faceți 
publice "
-"aceste modificări, trebuie să nu fiți obligat să notificați pe cineva 
în mod "
-"special, sub nici o formă."
+
+#. type: Content of: <h4>
+#, fuzzy
+msgid "The freedom to run the program as you wish"
+msgstr ""
+"Libertatea de a utiliza programul dupa cum doriți, în orice scop 
(libertatea "
+"0)."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -251,35 +257,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <p>
-#, fuzzy
-#| 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 versions.  (Distributing programs in runnable form is "
-#| "necessary for conveniently installable free operating systems.)  It is ok "
-#| "if there is no way to produce a binary or executable form for a certain "
-#| "program (since some languages don't support that feature), but you must "
-#| "have the freedom to redistribute such forms should you find or develop a "
-#| "way to make them."
-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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Libertatea de a redistribui copii trebuie să includă forme binare sau "
-"executabile ale programului, ca și codul sursă, atât în versiunile 
originale "
-"cât și în cele modificate. (Distribuirea programelor în formă 
executabilă e "
-"necesară pentru ușurința instalării sistemelor de operare libere). Putem "
-"chiar trece cu vederea faptul că nu există concret posibilitatea de a "
-"produce formă binară sau executabilă pentru un anumit program (anumite "
-"limbaje de calculator nu suportă acest mod de lucru), dacă 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: <p>
 #, fuzzy
@@ -323,6 +303,59 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Libertatea de a redistribui copii, în scopul ajutorării aproapelui tău "
+"(libertatea 2). "
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms. Thus, you "
+#| "should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Un program este software liber dacă întrunește toate aceste libertăți. "
+"Astfel, ar trebui să fiți liberi să redistribuiți copii, modificate sau 
nu, "
+"gratuit sau contra unei sume pentru costurile de desfacere, <a href="
+"\"#exportcontrol\">oricui, oriunde</a>. Libertatea de a face aceste 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: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Trebuie de asemenea să aveți libertatea de a face modificări și de a le "
+"folosi pentru uz personal, cu titlu profesional sau în scop recreativ, 
fără "
+"a menționa cuiva că aceste modificări există. Dacă totuși faceți 
publice "
+"aceste modificări, trebuie să nu fiți obligat să notificați pe cineva 
în mod "
+"special, sub nici o formă."
+
+#. type: Content of: <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"
@@ -333,21 +366,36 @@
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, without your doing anything to give cause, the "
-#| "software is not free."
+#| "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 conveniently installable free operating systems.)  It is ok "
+#| "if there is no way to produce a binary or executable form for a certain "
+#| "program (since some languages don't support that feature), but you must "
+#| "have the freedom to redistribute such forms should you find or develop a "
+#| "way to make them."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Libertatea de a redistribui copii trebuie să includă forme binare sau "
+"executabile ale programului, ca și codul sursă, atât în versiunile 
originale "
+"cât și în cele modificate. (Distribuirea programelor în formă 
executabilă e "
+"necesară pentru ușurința instalării sistemelor de operare libere). Putem "
+"chiar trece cu vederea faptul că nu există concret posibilitatea de a "
+"produce formă binară sau executabilă pentru un anumit program (anumite "
+"limbaje de calculator nu suportă acest mod de lucru), dacă 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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Pentru ca aceste libertăți să fie reale, ele trebuie să fie irevocabile 
atât "
-"timp cât utilizatorii nu comit vreo faptă ilegală; dacă autorul 
programului "
-"are prerogativa 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: <p>
 #, fuzzy
@@ -359,12 +407,12 @@
 #| "other people the central freedoms.  This rule does not conflict with the "
 #| "central freedoms; rather it protects them."
 msgid ""
-"However, 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."
+"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."
 msgstr ""
 "Totuși, există și anumite reguli acceptabile privind distribuirea de "
 "software liber, atunci când aceste reguli nu afectează libertățile 
centrale. "
@@ -407,42 +455,8 @@
 "relațiile și diferențele dintre „software-ul liber”, „software-ul 
sub "
 "copyleft” și alte categorii de software."
 
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; does not mean &ldquo;non-commercial&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. 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 ""
-"&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>."
-msgstr ""
-"„Software liber” nu înseamnă „non-comercial”. Un program liber 
trebuie să "
-"fie utilizabil în scop comercial, și disponibil pentru dezvoltare și "
-"distribuție comercială. Dezvoltarea comercială a software-ului liber nu 
mai "
-"este ceva neobișnuit; iar software-ul comercial liber este foarte important. 
"
-"Astfel, se poate întâmpla să plătiți pentru a dobândi cópii ale unor "
-"programe GNU, ori, la fel de bine, puteți obține cópii 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 href=\"/philosophy/selling.html"
-"\">a vinde cópii</a> ale acestora."
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 #. type: Content of: <p>
@@ -457,15 +471,14 @@
 #| "require that, if you have distributed a modified version and a previous "
 #| "developer asks for a copy of it, you must send one."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Instituirea de condiții privind modul de a pune pe piață o versiune "
 "modificată este acceptabilă, dacă acestea nu anulează libertatea 
d-voastră "
@@ -499,6 +512,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -538,6 +555,29 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, without your doing anything to give cause, the "
+#| "software is not free."
+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 "
+"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."
+msgstr ""
+"Pentru ca aceste libertăți să fie reale, ele trebuie să fie irevocabile 
atât "
+"timp cât utilizatorii nu comit vreo faptă ilegală; dacă autorul 
programului "
+"are prerogativa 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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -553,6 +593,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -573,6 +617,10 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -604,6 +652,10 @@
 "<a href=\"/philosophy/fs-translations.html\">traduceri ale conceptului de "
 "„free software” (software liber)</a> în mai multe limbi."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -631,6 +683,10 @@
 "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: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ru.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- po/free-sw.ru.po    21 Aug 2016 09:28:17 -0000      1.83
+++ po/free-sw.ru.po    16 Nov 2016 21:58:10 -0000      1.84
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-08-21 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2016-11-16 21:55+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -108,6 +109,10 @@
 "программу; это делает программу <a 
href=\"/philosophy/free-software-even-"
 "more-important.html\"> орудием несправедливой 
власти</a>."
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -181,41 +186,45 @@
 "если мы планируем изменить А так, чтобы в 
ней не применялась Б, то свободной "
 "нужно быть только программе А; Б на эти 
планы никак не влияет."
 
-#. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-"Далее на этой странице поясняются 
определенные аспекты того, что делает "
-"конкретные свободы достаточными или 
недостаточными."
-
 # type: Content of: <p>
 #. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"Свобода распространять (свободы 2 и 3) 
означает, что вы вольны передавать "
-"копии, с изменениями или без них, 
бесплатно или взимая плату за "
-"распространение, <a href=\"#exportcontrol\">кому 
угодно и где угодно</a>. "
-"Свобода этих действий означает (кроме 
прочего), что вы не обязаны спрашивать "
-"разрешения на эти действия или платить за 
него."
+"&ldquo;Свободная программа&rdquo; не значит 
&ldquo;некоммерческая&rdquo;. "
+"Свободная программа должна быть доступна 
для коммерческого применения, "
+"коммерческой разработки и коммерческого 
распространения. Коммерческая "
+"разработка свободных программ уже не 
является чем-то из ряда вон выходящим; "
+"такие свободные коммерческие программы 
очень важны. Может быть, вы заплатили "
+"деньги за то, чтобы получить свободные 
программы, а может быть, они вам "
+"достались бесплатно. Но независимо от 
того, как вы получили свои копии, вы "
+"всегда вольны копировать и изменять 
программы и даже <a href=\"/philosophy/"
+"selling.html\">продавать копии</a>."
 
-# type: Content of: <p>
 #. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"У вас также должна быть свобода вносить 
изменения и пользоваться ими частным "
-"порядком на работе или в игре, даже без 
упоминания о том, что они "
-"существуют. Если же вы публикуете свои 
изменения, от вас не должны требовать "
-"извещать об этом кого-то конкретно или 
каким-то конкретным способом."
+"Далее на этой странице поясняются 
определенные аспекты того, что делает "
+"конкретные свободы достаточными или 
недостаточными."
+
+# type: Content of: <ul><li>
+#. type: Content of: <h4>
+# | The freedom to run the program as you [-wish, for any purpose (freedom
+# | 0).-] {+wish+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
+msgstr "Свобода выполнять программу как вам 
угодно в любых целях (свобода 0)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -248,25 +257,9 @@
 "не мешают делать это. Это никак не связано 
ни с тем, какой функциональностью "
 "обладает программа, ни с тем, полезна ли 
она для того, что вы хотите делать."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Свобода передавать копии должна 
распространяться как на двоичные или "
-"исполняемые формы программы, так и на исх
одный текст, с изменениями или без "
-"них (распространение программ в 
исполнимом виде необходимо для удобства в "
-"установке свободных операционных систем). 
Для некоторой программы может не "
-"существовать способа преобразования в 
двоичный или исполняемый вид "
-"(поскольку некоторые языки не 
поддерживают такой возможности), но вы 
должны "
-"быть вольны распространять программу в 
таком виде, если вы найдете или "
-"разработаете способ такого 
преобразования."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -325,6 +318,56 @@
 # type: Content of: <p>
 #. type: Content of: <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 ""
+"Улучшает ли изменение программу&nbsp;&mdash; 
вопрос субъективный. Если ваше "
+"право изменять программу по существу 
ограничено лишь изменениями, которые "
+"кто-то другой считает улучшениями, то эта 
программа не свободна."
+
+# type: Content of: <ul><li>
+#. type: Content of: <h4>
+# | The freedom to redistribute [-copies so-] {+if+} you [-can help your
+# | neighbor (freedom 2).-] {+wish: basic requirements+}
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr "Свобода передавать копии, чтобы 
помочь своему ближнему (свобода 2)."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Свобода распространять (свободы 2 и 3) 
означает, что вы вольны передавать "
+"копии, с изменениями или без них, 
бесплатно или взимая плату за "
+"распространение, <a href=\"#exportcontrol\">кому 
угодно и где угодно</a>. "
+"Свобода этих действий означает (кроме 
прочего), что вы не обязаны спрашивать "
+"разрешения на эти действия или платить за 
него."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"У вас также должна быть свобода вносить 
изменения и пользоваться ими частным "
+"порядком на работе или в игре, даже без 
упоминания о том, что они "
+"существуют. Если же вы публикуете свои 
изменения, от вас не должны требовать "
+"извещать об этом кого-то конкретно или 
каким-то конкретным способом."
+
+# type: Content of: <p>
+#. type: Content of: <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"
@@ -341,27 +384,52 @@
 # type: Content of: <p>
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Свобода передавать копии должна 
распространяться как на двоичные или "
+"исполняемые формы программы, так и на исх
одный текст, с изменениями или без "
+"них (распространение программ в 
исполнимом виде необходимо для удобства в "
+"установке свободных операционных систем). 
Для некоторой программы может не "
+"существовать способа преобразования в 
двоичный или исполняемый вид "
+"(поскольку некоторые языки не 
поддерживают такой возможности), но вы 
должны "
+"быть вольны распространять программу в 
таком виде, если вы найдете или "
+"разработаете способ такого 
преобразования."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Чтобы эти свободы были действительны, они 
должны быть непрерывны и "
-"неотзываемы до тех пор, пока вы не делаете 
ничего дурного; если за "
-"разработчиком программы остается право 
отозвать лицензию или добавлять "
-"ограничения в ее условия после факта 
распространения без какого бы то ни "
-"было повода с вашей стороны, то программа 
несвободна."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+# | [-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.
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Однако определенного рода правила о 
формах распространения свободных "
 "программ допустимы, когда они не 
противоречат центральным свободам. "
@@ -392,51 +460,41 @@
 "разновидности программ, см. в <a 
href=\"/philosophy/categories.html"
 "\">классификации свободных программ</a>."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-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>."
-msgstr ""
-"&ldquo;Свободная программа&rdquo; не значит 
&ldquo;некоммерческая&rdquo;. "
-"Свободная программа должна быть доступна 
для коммерческого применения, "
-"коммерческой разработки и коммерческого 
распространения. Коммерческая "
-"разработка свободных программ уже не 
является чем-то из ряда вон выходящим; "
-"такие свободные коммерческие программы 
очень важны. Может быть, вы заплатили "
-"деньги за то, чтобы получить свободные 
программы, а может быть, они вам "
-"достались бесплатно. Но независимо от 
того, как вы получили свои копии, вы "
-"всегда вольны копировать и изменять 
программы и даже <a href=\"/philosophy/"
-"selling.html\">продавать копии</a>."
-
-# type: Content of: <p>
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"Улучшает ли изменение программу&nbsp;&mdash; 
вопрос субъективный. Если ваше "
-"право изменять программу по существу 
ограничено лишь изменениями, которые "
-"кто-то другой считает улучшениями, то эта 
программа не свободна."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+# | [-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
+# | privately.  Thus, it is acceptable for the license to require that you
+# | change the name of the modified version, remove a logo, or identify your
+# | modifications as yours.  As long as these requirements are not so
+# | burdensome that they effectively hamper you from releasing your changes,
+# | they are acceptable; you're already making other changes to the program,
+# | so you won't have trouble making a few more.
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Однако правила об оформлении 
модифицированных версий допустимы, если 
они по "
 "существу не ограничивают вашу свободу 
выпускать модифицированные версии, а "
@@ -487,6 +545,10 @@
 "вам задать имя первоначальной программы 
как перенаправление на измененную "
 "версию."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -527,6 +589,25 @@
 "сделать это требование нетривиальным и 
тем самым обратить программу в "
 "несвободную."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Чтобы эти свободы были действительны, они 
должны быть непрерывны и "
+"неотзываемы до тех пор, пока вы не делаете 
ничего дурного; если за "
+"разработчиком программы остается право 
отозвать лицензию или добавлять "
+"ограничения в ее условия после факта 
распространения без какого бы то ни "
+"было повода с вашей стороны, то программа 
несвободна."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -550,6 +631,10 @@
 "Для лицензии свободных программ 
допустимо указывать, закон какой 
юрисдикции "
 "применим, где должны проходить 
разбирательства или и то, и другое."
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -586,6 +671,10 @@
 "упомянут здесь как правомерный, нам 
придется подумать об этом, и мы, "
 "вероятно, придем к заключению, что она не 
свободна."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -608,6 +697,10 @@
 "также список верных <a 
href=\"/philosophy/fs-translations.html\">переводов "
 "выражения &ldquo;свободные программы&rdquo;</a> 
на разные языки."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -636,6 +729,10 @@
 "проще понять, почему определенные 
лицензии удовлетворяют или не "
 "удовлетворяют им."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.sk.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sk.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- po/free-sw.sk.po    20 Aug 2016 14:58:40 -0000      1.57
+++ po/free-sw.sk.po    16 Nov 2016 21:58:10 -0000      1.58
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2009-09-27 17:27+0200\n"
 "Last-Translator: Dominik Smatana <address@hidden>\n"
 "Language-Team: Slovak <address@hidden>\n"
@@ -115,6 +115,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -198,49 +202,49 @@
 "that plan."
 msgstr ""
 
-#. type: Content of: <p>
-msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr ""
-
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
+#| "<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 ""
-"Freedom to distribute (freedoms 2 and 3) means you are free to redistribute "
-"copies, either with or without modifications, either gratis or charging a "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"Program je slobodným softvérom, ak užívateľom poskytuje všetky vyššie 
"
-"uvedené slobody.  To znamená, že vám musí byť dovolené voľne šíriť 
jeho "
-"kópie, či už pôvodnej alebo vami upravenej verzie, či už bezplatne 
alebo za "
-"poplatok, a to <a href=\"#exportcontrol\">komukoľvek kdekoľvek</a>.  Mať "
-"dovolené robiť uvedené veci znamná (okrem iného), že si nemusíte od 
nikoho "
-"pýtať povolenie, alebo za takéto povolenie niekomu platiť."
+"„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: <p>
 #. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Mali by ste mať tiež zaručenú slobodu vykonávať zmeny a používať ich 
"
-"súkromne pri vašej práci alebo zábave bez toho, aby ste boli povinní o "
-"týchto zmenách niekoho informovať.  Ak sa rozhodnete svoje zmeny 
zverejniť, "
-"tiež nesmie byť vyžadované, aby ste o tom niekoho museli informovať "
-"akýmkoľvek spôsobom."
+
+# type: Content of: <ul><li>
+#. type: Content of: <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 "Sloboda spúšťať program, a to za akýmkoľvek účelom (sloboda 
0)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -280,25 +284,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Sloboda voľne šíriť kópie musí zahŕňať jednak binárne a 
spúšťateľné formy "
-"programu a taktiež jeho zdrojové kódy, či už ide o pôvodnú alebo "
-"modifikovanú verziu.  (Distribúcia programov v spúšťateľnej forme je "
-"nevyhnutná pre zabezpečenie možnosti pohodlnej inštalácie slobodného "
-"operačného systému.)  Je v poriadku, ak neexistuje spôsob ako vytvoriť "
-"binárnu alebo spúšťateľnú formu pre určitý program (nakoľko 
niektoré jazyky "
-"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: <p>
 #. type: Content of: <p>
@@ -372,6 +360,69 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Whether a change constitutes an improvement is a subjective matter.  If "
+#| "your modifications are limited, in substance, to changes that someone "
+#| "else considers an improvement, that is not freedom."
+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 ""
+"To, či nejaká zmena programu predstavuje jeho vylepšenie, je vecou "
+"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: <ul><li>
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+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: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Program je slobodným softvérom, ak užívateľom poskytuje všetky vyššie 
"
+"uvedené slobody.  To znamená, že vám musí byť dovolené voľne šíriť 
jeho "
+"kópie, či už pôvodnej alebo vami upravenej verzie, či už bezplatne 
alebo za "
+"poplatok, a to <a href=\"#exportcontrol\">komukoľvek kdekoľvek</a>.  Mať "
+"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: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Mali by ste mať tiež zaručenú slobodu vykonávať zmeny a používať ich 
"
+"súkromne pri vašej práci alebo zábave bez toho, aby ste boli povinní o "
+"týchto zmenách niekoho informovať.  Ak sa rozhodnete svoje zmeny 
zverejniť, "
+"tiež nesmie byť vyžadované, aby ste o tom niekoho museli informovať "
+"akýmkoľvek spôsobom."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
@@ -382,25 +433,27 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| 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 "
-#| "software has the power to revoke the license, or retroactively change its "
-#| "terms, without your doing anything wrong to give cause, the software is "
-#| "not free."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Sloboda voľne šíriť kópie musí zahŕňať jednak binárne a 
spúšťateľné formy "
+"programu a taktiež jeho zdrojové kódy, či už ide o pôvodnú alebo "
+"modifikovanú verziu.  (Distribúcia programov v spúšťateľnej forme je "
+"nevyhnutná pre zabezpečenie možnosti pohodlnej inštalácie slobodného "
+"operačného systému.)  Je v poriadku, ak neexistuje spôsob ako vytvoriť "
+"binárnu alebo spúšťateľnú formu pre určitý program (nakoľko 
niektoré jazyky "
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Na to, aby boli tieto slobody skutočné, musia byť trvalé a musí byť 
zaručená "
-"ich neodvolateľnosť po celý čas, za predpokladu, že nekonáte v rozpore 
s "
-"príslušnou licenciu; ak má autor softvéru možnosť odvolať udelenú 
licenciu "
-"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: <p>
 #. type: Content of: <p>
@@ -413,12 +466,12 @@
 #| "other people the central freedoms.  This rule does not conflict with the "
 #| "central freedoms; rather it protects them."
 msgid ""
-"However, 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."
+"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."
 msgstr ""
 "Napriek tomu sú však isté pravidlá upravujúce spôsob šírenia 
slobodného "
 "softvéru prijateľné, za predpokladu, že nie sú v rozpore so základnými 
"
@@ -462,52 +515,9 @@
 "<q>slobodný softvér,</q> <q>copyleftovaný softvér</q> a iné druhy 
softvéru "
 "navzájom súvisia."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-#, 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 ""
-"&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>."
-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: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Whether a change constitutes an improvement is a subjective matter.  If "
-#| "your modifications are limited, in substance, to changes that someone "
-#| "else considers an improvement, that is not freedom."
-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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"To, či nejaká zmena programu predstavuje jeho vylepšenie, je vecou "
-"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: <p>
 #. type: Content of: <p>
@@ -526,15 +536,14 @@
 #| "a copy of it, you must send one, or that you identify yourself on your "
 #| "modifications."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Isté pravidlá, upresňujúce spôsob, akým má byť upravená verzia 
zbalená, sú "
 "však akceptovateľné, za predpokladu, že zásadným spôsobom neobmedzujú 
vašu "
@@ -574,6 +583,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -617,6 +630,32 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| 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 "
+#| "software has the power to revoke the license, or retroactively change its "
+#| "terms, without your doing anything wrong to give cause, the software is "
+#| "not free."
+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 "
+"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."
+msgstr ""
+"Na to, aby boli tieto slobody skutočné, musia byť trvalé a musí byť 
zaručená "
+"ich neodvolateľnosť po celý čas, za predpokladu, že nekonáte v rozpore 
s "
+"príslušnou licenciu; ak má autor softvéru možnosť odvolať udelenú 
licenciu "
+"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: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -632,6 +671,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -668,6 +711,10 @@
 "oprávnený, budeme sa ňou musieť podrobnejšie zaoberať, ale 
pravdepodobne "
 "nebude uznaná ako slobodná."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -700,6 +747,10 @@
 "philosophy/fs-translations.html\">prekladov výrazu „slobodný 
softvér“</a> do "
 "rôznych jazykov."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -729,6 +780,10 @@
 "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: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sr.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- po/free-sw.sr.po    20 Aug 2016 14:58:40 -0000      1.60
+++ po/free-sw.sr.po    16 Nov 2016 21:58:10 -0000      1.61
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2008-07-16 17:03+0200\n"
 "Last-Translator: Strahinya Radich <address@hidden>\n"
 "Language-Team: Serbian <address@hidden>\n"
@@ -102,6 +102,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -179,47 +183,41 @@
 "that plan."
 msgstr ""
 
+# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
+"„Слободни софтвер“ није и 
„некомерцијалан“. Слободни програм мора 
бити "
+"доступан за комерцијалну употребу, 
комерцијални развој програма и "
+"комерцијалну расподелу. Комерцијални 
развој слободног софтвера више није "
+"неуобичајен. Такав, слободан, 
комерцијални софтвер је веома битан. Стога, 
"
+"можда ћете плаћати новчани износ за 
примерке слободног софтвера, или ћете их "
+"набављати бесплатно. Али без обзира на то 
како сте дошли до вашег примерка, "
+"увек ћете моћи да умножавате и мењате 
софтвер, па чак и да га <a href=\"/"
+"philosophy/selling.html\">продајете</a>."
 
-# type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Програм је слободан софтвер уколико се 
корисницима пружају све ове слободе. "
-"На тај начин, дозвољено вам је да 
расподељујете примерке, са или без измена, "
-"бесплатно или уз наплату расподељивања, <a 
href=\"#exportcontrol\">свакоме, "
-"и било где</a>. Имати слободу да се то чини 
значи (између осталог) да за то "
-"не морате да тражите дозволу нити да за њу 
плаћате."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+# type: Content of: <ul><li>
+#. type: Content of: <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 ""
-"Дозвољено вам је да мењате такве програме 
и да ваше измене користите "
-"приватно, у вашем послу или игри, чак и без 
њиховог помињања другима. "
-"Уколико ипак објавите ваше измене, од вас 
се не захтева да икога посебно или "
-"на било какав одређен начин о томе 
обавестите."
+"Слободу покретања програма по вашој жељи, 
за било коју сврху (слобода број "
+"0)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -248,25 +246,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Слобода расподеле примерака мора да 
укључује бинарне или извршне облике "
-"програма, али и изворни код, како за 
неизмењене, тако и за измењене верзије "
-"програма. (Расподела програма у извршном 
облику је неопходна за згодно "
-"инсталирање слободних оперативних 
система.) У реду је уколико не постоји "
-"начин да се за одређени програм створи 
бинарни или извршни облик, јер "
-"извесни програмски језици тако нешто не 
подржавају, али мора постојати "
-"слобода расподеле таквих облика уколико 
измислите или изградите начин да се "
-"они направе."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -315,6 +297,60 @@
 "који додате, онда је таква лиценца превише 
рестриктивна да би могла да се "
 "назове слободном."
 
+#. type: Content of: <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: <ul><li>
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Слободу расподељивања примерака 
програма, како бисте могли да помогнете "
+"ближњем (слобода број 2)."
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Програм је слободан софтвер уколико се 
корисницима пружају све ове слободе. "
+"На тај начин, дозвољено вам је да 
расподељујете примерке, са или без измена, "
+"бесплатно или уз наплату расподељивања, <a 
href=\"#exportcontrol\">свакоме, "
+"и било где</a>. Имати слободу да се то чини 
значи (између осталог) да за то "
+"не морате да тражите дозволу нити да за њу 
плаћате."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Дозвољено вам је да мењате такве програме 
и да ваше измене користите "
+"приватно, у вашем послу или игри, чак и без 
њиховог помињања другима. "
+"Уколико ипак објавите ваше измене, од вас 
се не захтева да икога посебно или "
+"на било какав одређен начин о томе 
обавестите."
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -327,27 +363,46 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Слобода расподеле примерака мора да 
укључује бинарне или извршне облике "
+"програма, али и изворни код, како за 
неизмењене, тако и за измењене верзије "
+"програма. (Расподела програма у извршном 
облику је неопходна за згодно "
+"инсталирање слободних оперативних 
система.) У реду је уколико не постоји "
+"начин да се за одређени програм створи 
бинарни или извршни облик, јер "
+"извесни програмски језици тако нешто не 
подржавају, али мора постојати "
+"слобода расподеле таквих облика уколико 
измислите или изградите начин да се "
+"они направе."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Како би ове слободе заживеле, оне морају 
да буду неопозиве, све док не "
-"чините ништа лоше. Уколико је градитељу 
софтвера допуштено да опозове "
-"лиценцу, без икаквог повода са ваше 
стране, такав софтвер није слободан."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Међутим, прихватљиве су одређене врсте 
правила о начину расподеле слободног "
 "софтвера, али само ако не долазе у сукоб са 
основним слободама. На пример, "
@@ -379,32 +434,8 @@
 "a> за опис односа између „слободног 
софтвера“, „копилефотваног софтвера“ и "
 "других категорија софтвера."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-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>."
-msgstr ""
-"„Слободни софтвер“ није и 
„некомерцијалан“. Слободни програм мора 
бити "
-"доступан за комерцијалну употребу, 
комерцијални развој програма и "
-"комерцијалну расподелу. Комерцијални 
развој слободног софтвера више није "
-"неуобичајен. Такав, слободан, 
комерцијални софтвер је веома битан. Стога, 
"
-"можда ћете плаћати новчани износ за 
примерке слободног софтвера, или ћете их "
-"набављати бесплатно. Али без обзира на то 
како сте дошли до вашег примерка, "
-"увек ћете моћи да умножавате и мењате 
софтвер, па чак и да га <a href=\"/"
-"philosophy/selling.html\">продајете</a>."
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 # type: Content of: <p>
@@ -421,15 +452,14 @@
 #| "developer asks for a copy of it, you must send one, or that you identify "
 #| "yourself on your modifications."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Евентуално постојање правила о начину 
паковања измењене верзије је "
 "прихватљиво, али само уколико не 
зауставља слободу објављивања измењених "
@@ -464,6 +494,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -495,6 +529,24 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+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 "
+"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."
+msgstr ""
+"Како би ове слободе заживеле, оне морају 
да буду неопозиве, све док не "
+"чините ништа лоше. Уколико је градитељу 
софтвера допуштено да опозове "
+"лиценцу, без икаквог повода са ваше 
стране, такав софтвер није слободан."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -510,6 +562,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -546,6 +602,10 @@
 "права), а који није овде наведен као 
легитиман, мораћемо да о томе "
 "размислимо, и вероватно ћемо одлучити да 
дотична лиценца није слободна."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -568,6 +628,10 @@
 "philosophy/fs-translations.html\">превода израза 
„слободни софтвер“</a> на "
 "разне језике."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -596,6 +660,10 @@
 "одређеног питања, ми често допунимо те 
критеријуме, како бисмо лакше увидели "
 "зашто су одређене лиценце одговарајуће 
или нису одговарајуће."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.sv.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.sv.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/free-sw.sv.po    20 Aug 2016 14:58:40 -0000      1.6
+++ po/free-sw.sv.po    16 Nov 2016 21:58:10 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: web-translators <address@hidden>\n"
@@ -93,6 +93,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -171,44 +175,38 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
+"”Fri programvara” betyder inte “icke kommersiell”. Ett fritt program 
måste "
+"finnas tillgängligt för kommersiell användning, kommersiell utveckling och 
"
+"kommersiell distribution. Kommersiell utveckling av fri programvara är inte "
+"längre ovanlig. Sådan fri programvara är mycket viktig. 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: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms. Thus, you "
-#| "should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Ett program är fri programvara om en användare har all dessa friheter. "
-"Således skall du vara fri att på nytt distribuera kopior, antingen med 
eller "
-"utan förändringar, antingen gratis eller mot en ersättning för "
-"distributionskostnaderna, till <a href=\"#exportcontrol\">vem som helst var "
-"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: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"Du skall också ha friheten att göra förändringar och använda dem privat 
i "
-"ditt eget arbete eller på din fritid, utan att ens berätta att dessa "
-"ändringar existerar. Om du publicerar dina ändringar, skall du inte vara "
-"skyldig att meddela någon speciell eller på något speciellt sätt."
+"Friheten att köra programmet som du önskar, för ett godtyckligt syfte "
+"(frihet 0)."
 
 #. type: Content of: <p>
 #, fuzzy
@@ -239,34 +237,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <p>
-#, fuzzy
-#| 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 versions.  (Distributing programs in runnable form is "
-#| "necessary for conveniently installable free operating systems.)  It is ok "
-#| "if there is no way to produce a binary or executable form for a certain "
-#| "program (since some languages don't support that feature), but you must "
-#| "have the freedom to redistribute such forms should you find or develop a "
-#| "way to make them."
-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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Friheten att distribuera kopior på nytt måste innefatta binärer, eller "
-"exekverbara former av programmet, så väl som källkoden för både den "
-"förändrade och den oförändrade versionen. (Att distribuera program i 
körbar "
-"form är nödvändigt för att bekvämt installera fria operativsystem.) Det 
är "
-"OK om det inte finns något sätt att producera binären eller den körbara "
-"formen för ett visst program (eftersom vissa språk inte stöder detta), men 
"
-"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: <p>
 #, fuzzy
@@ -310,6 +283,58 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Friheten att vidaredistribuera kopior så att användaren kan hjälpa sin 
nästa "
+"(frihet 2)."
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms. Thus, you "
+#| "should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Ett program är fri programvara om en användare har all dessa friheter. "
+"Således skall du vara fri att på nytt distribuera kopior, antingen med 
eller "
+"utan förändringar, antingen gratis eller mot en ersättning för "
+"distributionskostnaderna, till <a href=\"#exportcontrol\">vem som helst var "
+"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: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Du skall också ha friheten att göra förändringar och använda dem privat 
i "
+"ditt eget arbete eller på din fritid, utan att ens berätta att dessa "
+"ä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: <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"
@@ -320,30 +345,53 @@
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
-#| "In order for these freedoms to be real, they must be irrevocable as long "
-#| "as you do nothing wrong; if the developer of the software has the power "
-#| "to revoke the license, without your doing anything to give cause, the "
-#| "software is not free."
+#| "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 conveniently installable free operating systems.)  It is ok "
+#| "if there is no way to produce a binary or executable form for a certain "
+#| "program (since some languages don't support that feature), but you must "
+#| "have the freedom to redistribute such forms should you find or develop a "
+#| "way to make them."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Friheten att distribuera kopior på nytt måste innefatta binärer, eller "
+"exekverbara former av programmet, så väl som källkoden för både den "
+"förändrade och den oförändrade versionen. (Att distribuera program i 
körbar "
+"form är nödvändigt för att bekvämt installera fria operativsystem.) Det 
är "
+"OK om det inte finns något sätt att producera binären eller den körbara "
+"formen för ett visst program (eftersom vissa språk inte stöder detta), men 
"
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"För att dessa friheter skall vara verkliga måste de vara oåterkalleliga 
så "
-"länge som du inte gör något fel. Om utvecklaren av programvaran har "
-"möjligheten att häva licensen, utan att du gör något som orsakar det, så 
är "
-"inte programvaran fri."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Emellertid, vissa regler för hur fri programvara skall distribueras är "
 "acceptabla när de inte är i konflikt med de centrala friheterna. Till "
@@ -385,31 +433,8 @@
 "“fri programvara”, “copyleftprogramvara” och andra kategorier av 
programvara "
 "relaterar till varandra."
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"”Fri programvara” betyder inte “icke kommersiell”. Ett fritt program 
måste "
-"finnas tillgängligt för kommersiell användning, kommersiell utveckling och 
"
-"kommersiell distribution. Kommersiell utveckling av fri programvara är inte "
-"längre ovanlig. Sådan fri programvara är mycket viktig. 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: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
 
 #. type: Content of: <p>
@@ -424,15 +449,14 @@
 #| "require that, if you have distributed a modified version and a previous "
 #| "developer asks for a copy of it, you must send one."
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Regler för hur en modifierad version skall packeteras är tillåtna om de 
inte "
 "i praktiken blockerar din frihet att ge ut förändrade versioner. Regler som 
"
@@ -465,6 +489,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -504,6 +532,29 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "In order for these freedoms to be real, they must be irrevocable as long "
+#| "as you do nothing wrong; if the developer of the software has the power "
+#| "to revoke the license, without your doing anything to give cause, the "
+#| "software is not free."
+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 "
+"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."
+msgstr ""
+"För att dessa friheter skall vara verkliga måste de vara oåterkalleliga 
så "
+"länge som du inte gör något fel. Om utvecklaren av programvaran har "
+"möjligheten att häva licensen, utan att du gör något som orsakar det, så 
är "
+"inte programvaran fri."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -519,6 +570,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -539,6 +594,10 @@
 "about it, and we will probably conclude it is nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -569,6 +628,10 @@
 "philosophy/fs-translations.html\">översättningar av “fri 
programvara”</a> "
 "för olika språk."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -595,6 +658,10 @@
 "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: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.tr.po,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- po/free-sw.tr.po    20 Aug 2016 14:58:40 -0000      1.68
+++ po/free-sw.tr.po    16 Nov 2016 21:58:10 -0000      1.69
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2009-09-17 19:55+0200\n"
 "Last-Translator: Ali Servet Dönmez <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -114,6 +114,10 @@
 "html\"> an instrument of unjust power</a>."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -200,47 +204,41 @@
 "that plan."
 msgstr ""
 
+# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
+"“Özgür yazılım”, “ticari olmayan” demek değildir. Özgür bir 
program, ticari "
+"kullanım, ticari geliştirme ve ticari dağıtım için kullanılabilir. 
Özgür "
+"yazılımların ticari geliştirilmeleri artık alışılmadık bir durum 
değil; "
+"artık özgür ticari yazılımlar çok önemlidir. Özgür yazılımın 
kopyları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, herzaman için yazılımın kopyalama, 
değiştirme "
+"ve hatta <a href=\"/philosophy/selling.html\">kopyalarını satma</a> "
+"haklarına sahipsinizdir."
 
-# type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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."
 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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Bir program, eğer kullanıcıları bu özgürlüklere sahipse özgür 
yazılımdır. "
-"Yani, kopyalarını değiştirerek ya da değiştirmeden, ücretli ya da 
ücretsiz, "
-"<a href=\"#exportcontrol\">herhangi bir yerdeki herhangi birine</a> "
-"dağıtmaya serbest olmalısınız. Özgür olmak demek (bu meyanda), tüm 
bunları "
-"yapmak için izin istemek ya da izin için ödeme yapmak zorunda olmamanız "
-"demektir."
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+# type: Content of: <ul><li>
+#. type: Content of: <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 ""
-"Ayrıca değişiklikler yapmak ve bu değişiklikleri özel olarak kendi 
işinizde "
-"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."
+"Herhangi bir amaç için yazılımı çalıştırma özgürlüğü (0 
numaralı özgürlük)."
 
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -270,25 +268,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-# type: Content of: <p>
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Programın kopyalarının dağıtımı özgürlüğü, programın hem 
değiştirilmiş hem "
-"de değiştirilmemiş, kaynak kodunda olduğu gibi ikili veya 
çalıştırılabilir "
-"halini içermesi zorunludur. (Programları çalıştırılabilir halleri ile "
-"dağıtmak kolayca yüklenebilen özgür işletim sistemleri için gerekiyor) 
Eğer, "
-"belli bir yazılımın ikili ya da çalıştırılabilir bir biçimini 
oluşturmak "
-"olanaksızsa (ki bazı diller bu özelliği desteklemiyor), o zaman sorun 
yok; "
-"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: <p>
 #. type: Content of: <p>
@@ -356,6 +338,70 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Whether a change constitutes an improvement is a subjective matter.  If "
+#| "your modifications are limited, in substance, to changes that someone "
+#| "else considers an improvement, that is not freedom."
+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 ""
+"Bir değiğikliğin aslında bir iyileştirme meydana getirip getirmemiş 
olacağı "
+"özneseldir, yani yoruma açıktır. Özünde, eğer sizin yaptığınız 
değişiklikler "
+"birbaşkasının onları iyileştirme saymasıyla sınırlılarsa, bu 
özgürlük "
+"değildir."
+
+# type: Content of: <ul><li>
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr ""
+"Kopyaları dağıtma özgürlüğü. Böylece komşunuza yardım 
edebilirsiniz (2 "
+"numaralı özgürlük)."
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Bir program, eğer kullanıcıları bu özgürlüklere sahipse özgür 
yazılımdır. "
+"Yani, kopyalarını değiştirerek ya da değiştirmeden, ücretli ya da 
ücretsiz, "
+"<a href=\"#exportcontrol\">herhangi bir yerdeki herhangi birine</a> "
+"dağıtmaya serbest olmalısınız. Özgür olmak demek (bu meyanda), tüm 
bunları "
+"yapmak için izin istemek ya da izin için ödeme yapmak zorunda olmamanız "
+"demektir."
+
+# type: Content of: <p>
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"Ayrıca değişiklikler yapmak ve bu değişiklikleri özel olarak kendi 
işinizde "
+"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: <p>
+#. type: Content of: <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 "
@@ -366,34 +412,46 @@
 
 # type: Content of: <p>
 #. type: Content of: <p>
-#, fuzzy
-#| 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 "
-#| "software has the power to revoke the license, or retroactively change its "
-#| "terms, without your doing anything wrong to give cause, the software is "
-#| "not free."
 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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Programın kopyalarının dağıtımı özgürlüğü, programın hem 
değiştirilmiş hem "
+"de değiştirilmemiş, kaynak kodunda olduğu gibi ikili veya 
çalıştırılabilir "
+"halini içermesi zorunludur. (Programları çalıştırılabilir halleri ile "
+"dağıtmak kolayca yüklenebilen özgür işletim sistemleri için gerekiyor) 
Eğer, "
+"belli bir yazılımın ikili ya da çalıştırılabilir bir biçimini 
oluşturmak "
+"olanaksızsa (ki bazı diller bu özelliği desteklemiyor), o zaman sorun 
yok; "
+"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: <h4>
+msgid "Copyleft"
 msgstr ""
-"Bu özgürlüklerin gerçek hayatta uygulanabilir olması için, yanlış bir 
şey "
-"yapmadığınız sürece, değiştirilemez olmaları gerekir; eğer 
geliştirici, bir "
-"soruna neden olabilecek hiçbir şey yapmadığınız halde, yazılımın 
lisansını "
-"değiştirecek güce sahipse, o halde o yazılımı özgür değildir."
 
 # type: Content of: <p>
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Buna rağmen, özgür yazılımı dağıtma konusundaki birtakım kurallar, 
merkezi "
 "özgürlüklerle çakışmadığı sürece, kabul edilebilir. Örneğin, <a 
href=\"/"
@@ -435,57 +493,20 @@
 "kategorileri ve bunların birbirleriyle ilişkilerini görmek için <a 
href=\"/"
 "philosophy/categories.html\">Özgür Yazılım Kategorileri</a> sayfasına 
bakın."
 
-# type: Content of: <p>
-#. type: Content of: <p>
-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>."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"“Özgür yazılım”, “ticari olmayan” demek değildir. Özgür bir 
program, ticari "
-"kullanım, ticari geliştirme ve ticari dağıtım için kullanılabilir. 
Özgür "
-"yazılımların ticari geliştirilmeleri artık alışılmadık bir durum 
değil; "
-"artık özgür ticari yazılımlar çok önemlidir. Özgür yazılımın 
kopyları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, herzaman için yazılımın kopyalama, 
değiştirme "
-"ve hatta <a href=\"/philosophy/selling.html\">kopyalarını satma</a> "
-"haklarına sahipsinizdir."
-
-# type: Content of: <p>
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Whether a change constitutes an improvement is a subjective matter.  If "
-#| "your modifications are limited, in substance, to changes that someone "
-#| "else considers an improvement, that is not freedom."
-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 ""
-"Bir değiğikliğin aslında bir iyileştirme meydana getirip getirmemiş 
olacağı "
-"özneseldir, yani yoruma açıktır. Özünde, eğer sizin yaptığınız 
değişiklikler "
-"birbaşkasının onları iyileştirme saymasıyla sınırlılarsa, bu 
özgürlük "
-"değildir."
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+"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 privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 
 # type: Content of: <p>
@@ -511,6 +532,10 @@
 "specify the original program's name as an alias for the modified version."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -555,6 +580,31 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+# type: Content of: <p>
+#. type: Content of: <p>
+#, fuzzy
+#| 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 "
+#| "software has the power to revoke the license, or retroactively change its "
+#| "terms, without your doing anything wrong to give cause, the software is "
+#| "not free."
+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 "
+"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."
+msgstr ""
+"Bu özgürlüklerin gerçek hayatta uygulanabilir olması için, yanlış bir 
şey "
+"yapmadığınız sürece, değiştirilemez olmaları gerekir; eğer 
geliştirici, bir "
+"soruna neden olabilecek hiçbir şey yapmadığınız halde, yazılımın 
lisansını "
+"değiştirecek güce sahipse, o halde o yazılımı özgür değildir."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -570,6 +620,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -606,6 +660,10 @@
 "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: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 #, fuzzy
@@ -637,6 +695,10 @@
 "bakabilirsiniz. “<a href=\"/philosophy/fs-translations.html\">özgür 
yazılım</"
 "a>” kavramının birçok dile çevirisini içeren bir listemiz var."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
@@ -664,6 +726,10 @@
 "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: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 # type: Content of: <p>
 #. type: Content of: <p>
 msgid ""

Index: po/free-sw.uk-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.uk-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/free-sw.uk-diff.html     19 Oct 2016 14:57:36 -0000      1.1
+++ po/free-sw.uk-diff.html     16 Nov 2016 21:58:10 -0000      1.2
@@ -22,10 +22,11 @@
 &lt;!--#include virtual="/server/banner.html" --&gt;
 
 &lt;h2&gt;What is free software?&lt;/h2&gt;
-&lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
+<span class="removed"><del><strong>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</strong></del></span>
 
 &lt;h3&gt;The Free Software Definition&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 &lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
@@ -62,6 +63,8 @@
 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;
 A program is free software if the program's users have the
 four essential freedoms:
@@ -96,12 +99,23 @@
 handle some cases.  If we plan to distribute A as it stands, that
 implies users will need B, so we need to judge whether both A and B
 are free.  However, if we plan to modify A so that it doesn't use B,
-only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;</em></ins></span>
+only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;
+
+&lt;p&gt;
+&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 
+&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The rest of this page clarifies certain points about what makes
 specific freedoms adequate or not.&lt;/p&gt;
 
-&lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
+<span class="removed"><del><strong>&lt;p&gt;Freedom to distribute (freedoms 2 
and 3) means you are free to
 redistribute copies, either with or without modifications, either
 gratis or charging a fee for distribution, to
 &lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
@@ -110,11 +124,13 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-You should also have the freedom to make modifications and use them
+You should also have the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>make modifications and use them
 privately in your own work or play, without even mentioning that they
-exist.  If you do publish your changes, you should not be required to
+exist.  If you do publish your changes,</strong></del></span> <span 
class="inserted"><ins><em>run the program as</em></ins></span> you <span 
class="removed"><del><strong>should not be required to
 notify anyone in particular, or in any particular way.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>wish&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -133,16 +149,17 @@
 functionality the program has, or whether it is useful for what you
 want to do.&lt;/p&gt;
 
-&lt;p&gt;
-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
+<span class="removed"><del><strong>&lt;p&gt;
+The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>redistribute copies must include binary or 
executable
+forms of</strong></del></span> <span 
class="inserted"><ins><em>study</em></ins></span> the <span 
class="removed"><del><strong>program, as well as</strong></del></span> source 
<span class="removed"><del><strong>code, for both 
modified</strong></del></span> <span 
class="inserted"><ins><em>code</em></ins></span> and
+<span class="removed"><del><strong>unmodified versions.  (Distributing 
programs in runnable form is necessary
 for conveniently installable free operating systems.)  It is OK if there
 is no way to produce a binary or executable form for a certain program
 (since some languages don't support that feature), but you must have the
-freedom to redistribute such forms should you find or develop a way to
-make them.
-&lt;/p&gt;
+freedom to redistribute such forms should you find or develop a way 
to</strong></del></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;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -173,6 +190,29 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;h4&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
+gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist.  If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -182,15 +222,26 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-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
-restrictions to its terms, without your doing anything wrong to give
-cause, the software is not free.
+<span class="removed"><del><strong>In order for these 
freedoms</strong></del></span>
+<span class="inserted"><ins><em>The freedom</em></ins></span> to <span 
class="removed"><del><strong>be real, they</strong></del></span> <span 
class="inserted"><ins><em>redistribute copies</em></ins></span> must <span 
class="removed"><del><strong>be permanent and
+irrevocable</strong></del></span> <span class="inserted"><ins><em>include 
binary or executable
+forms of the program,</em></ins></span> as <span 
class="removed"><del><strong>long</strong></del></span> <span 
class="inserted"><ins><em>well</em></ins></span> as <span 
class="inserted"><ins><em>source code, for both modified and
+unmodified versions.  (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.)  It is OK if there
+is no way to produce a binary or executable form for a certain program
+(since some languages don't support that feature), but</em></ins></span> you 
<span class="removed"><del><strong>do nothing wrong; if the developer of the
+software has</strong></del></span> <span class="inserted"><ins><em>must 
have</em></ins></span> the <span 
class="removed"><del><strong>power</strong></del></span>
+<span class="inserted"><ins><em>freedom</em></ins></span> to <span 
class="removed"><del><strong>revoke the license,</strong></del></span> <span 
class="inserted"><ins><em>redistribute such forms should you 
find</em></ins></span> or <span class="removed"><del><strong>retroactively add
+restrictions to its terms, without your doing anything 
wrong</strong></del></span> <span class="inserted"><ins><em>develop a 
way</em></ins></span> to <span class="removed"><del><strong>give
+cause, the software is not free.</strong></del></span>
+<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>
+
 &lt;p&gt;
-However, certain kinds of rules about the manner of distributing free
+<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;
 (very simply stated) is the rule that when redistributing the program,
@@ -212,14 +263,16 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;p&gt;
+<span class="removed"><del><strong>&lt;p&gt;
 &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 
+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 
 &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
 &lt;/p&gt;
 
@@ -227,10 +280,11 @@
 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.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>distribution 
details&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
-However, rules about how to package a modified version are acceptable,
+<span class="removed"><del><strong>However, rules</strong></del></span>
+<span class="inserted"><ins><em>Rules</em></ins></span> 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 privately.
 Thus, it is acceptable for the license to require that you change the
@@ -262,6 +316,8 @@
 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>
+
 &lt;p&gt;
 Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
 and trade sanctions can constrain your freedom to distribute copies of
@@ -284,6 +340,16 @@
 software nonfree.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt;Legal considerations&lt;/h4&gt;
+
+&lt;p&gt;
+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
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+&lt;/p&gt;</em></ins></span>
+
 &lt;p&gt;
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -298,6 +364,8 @@
 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>
+
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -317,6 +385,8 @@
 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;
 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
@@ -328,6 +398,8 @@
 &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;
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -342,6 +414,8 @@
 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>
+
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
 software license, see our &lt;a href="/licenses/license-list.html"&gt;list
@@ -582,7 +656,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/10/19 14:57:36 $
+$Date: 2016/11/16 21:58:10 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/free-sw.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.uk.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- po/free-sw.uk.po    20 Aug 2016 14:58:40 -0000      1.50
+++ po/free-sw.uk.po    16 Nov 2016 21:58:10 -0000      1.51
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2016-01-02 08:32+0200\n"
 "Last-Translator: Andriy Bandura <address@hidden>\n"
 "Language-Team: Ukrainian <>\n"
@@ -115,6 +115,10 @@
 "програму; це робить програму <a 
href=\"/philosophy/free-software-even-more-"
 "important.html\">знаряддям несправедливої 
влади</a>. "
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -195,37 +199,39 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
-"Далі на цій сторінці пояснюються певні 
аспекти того, що робитьконкретні "
-"свободи достатніми чи недостатніми."
+"&ldquo;Вільна програма&rdquo; не означає 
&ldquo;некомерційна &rdquo;. Вільна "
+"програма повинна бути доступна для 
комерційного застосування, комерційної "
+"розробки та комерційного розповсюдження. 
Комерційна розробка вільних програм "
+"вже не є чимось незвичайним; такі вільні 
комерційні програми дуже важливі. "
+"Можливо, ви заплатили гроші за те, щоб 
отримати вільні програми, а може вони "
+"вам дісталися безкоштовно. Але незалежно 
від того, як ви отримали свої "
+"копії, ви завжди вільні копіювати та 
змінювати програми і навіть <a href=\"/"
+"philosophy/selling.html\">продавати копії</a>."
 
 #. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"Свобода поширювати (свободи 2 і 3) означає, 
що ви вільні передавати копії зі "
-"змінами або без них, безкоштовно або 
стягуючи плату за поширення, <a href="
-"\"#exportcontrol\">кому завгодно і де завгодно</a>. 
Свобода цих дій означає "
-"(крім іншого), що ви не зобов'язані питати 
дозволу на ці дії або платити за "
-"нього. "
+"Далі на цій сторінці пояснюються певні 
аспекти того, що робитьконкретні "
+"свободи достатніми чи недостатніми."
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"У вас також повинна бути свобода вносити 
зміни і користуватися ними "
-"приватним порядком на роботі або в грі, 
навіть без згадки про те, що вони "
-"існують. Якщо ж ви публікуєте свої зміни, 
від вас не повинні вимагати "
-"сповіщати про це когось конкретно або 
якимось конкретним способом."
+"Свобода виконувати програму як вам 
завгодно в будь-яких цілях (свобода 0)."
 
 #. type: Content of: <p>
 msgid ""
@@ -257,24 +263,9 @@
 "не заважають робити це. Це ніяк не 
пов'язано ні з тим, якою функціональністю "
 "програма володіє, ні з тим, чи корисна вона 
для того, що ви хочете робити."
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"Свобода передавати копії повинна 
поширюватися як на двійкові або виконувані 
"
-"форми програми, так і на вихідний текст, зі 
змінами або без них "
-"(розповсюдження програм у бінарному 
вигляді необхідно для зручності в "
-"встановлення вільних операційних систем). 
Для деякої програми може не "
-"існувати способу перетворення у 
двійковий або виконуваний вигляд (оскільки 
"
-"деякі мови не підтримують такої 
можливості), але ви повинні бути вільні "
-"поширювати програму в такому вигляді, 
якщо ви знайдете або розробите спосіб "
-"такого перетворення."
 
 #. type: Content of: <p>
 msgid ""
@@ -328,6 +319,50 @@
 
 #. type: Content of: <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 ""
+"Покращує зміна програму&nbsp;&nbsp; питання 
суб'єктивне. Якщо ваше право "
+"змінювати програму по суті обмежена лише 
змінами, які хтось інший вважає "
+"поліпшеннями, то ця програма не вільна."
+
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr "Свобода передавати копії, щоб 
допомогти своєму ближньому (свобода 2)."
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"Свобода поширювати (свободи 2 і 3) означає, 
що ви вільні передавати копії зі "
+"змінами або без них, безкоштовно або 
стягуючи плату за поширення, <a href="
+"\"#exportcontrol\">кому завгодно і де завгодно</a>. 
Свобода цих дій означає "
+"(крім іншого), що ви не зобов'язані питати 
дозволу на ці дії або платити за "
+"нього. "
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"У вас також повинна бути свобода вносити 
зміни і користуватися ними "
+"приватним порядком на роботі або в грі, 
навіть без згадки про те, що вони "
+"існують. Якщо ж ви публікуєте свої зміни, 
від вас не повинні вимагати "
+"сповіщати про це когось конкретно або 
якимось конкретним способом."
+
+#. type: Content of: <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"
@@ -342,26 +377,44 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"Свобода передавати копії повинна 
поширюватися як на двійкові або виконувані 
"
+"форми програми, так і на вихідний текст, зі 
змінами або без них "
+"(розповсюдження програм у бінарному 
вигляді необхідно для зручності в "
+"встановлення вільних операційних систем). 
Для деякої програми може не "
+"існувати способу перетворення у 
двійковий або виконуваний вигляд (оскільки 
"
+"деякі мови не підтримують такої 
можливості), але ви повинні бути вільні "
+"поширювати програму в такому вигляді, 
якщо ви знайдете або розробите спосіб "
+"такого перетворення."
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"Щоб ці свободи були дійсні, вони повинні 
бути неперервні і невідкличні до "
-"тих пір, поки ви не робите нічого поганого; 
якщо за розробником програми "
-"залишається право відкликати ліцензію 
або додавати обмеження в її умови "
-"після факту розповсюдження без якого б то 
ні було приводу з вашої сторони, "
-"то програма невільна."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "Однак певного роду правила про форми 
поширення вільних програм припустимі, "
 "коли вони не суперечать центральним 
свободам. Наприклад, копілефт (дуже "
@@ -389,47 +442,31 @@
 "співвідносяться між собою &ldquo;вільні 
програми&rdquo;, &ldquo;програми з "
 "копілефтом&rdquo; та інші різновиди 
програмного забезпечення."
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"&ldquo;Вільна програма&rdquo; не означає 
&ldquo;некомерційна &rdquo;. Вільна "
-"програма повинна бути доступна для 
комерційного застосування, комерційної "
-"розробки та комерційного розповсюдження. 
Комерційна розробка вільних програм "
-"вже не є чимось незвичайним; такі вільні 
комерційні програми дуже важливі. "
-"Можливо, ви заплатили гроші за те, щоб 
отримати вільні програми, а може вони "
-"вам дісталися безкоштовно. Але незалежно 
від того, як ви отримали свої "
-"копії, ви завжди вільні копіювати та 
змінювати програми і навіть <a href=\"/"
-"philosophy/selling.html\">продавати копії</a>."
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"Покращує зміна програму&nbsp;&nbsp; питання 
суб'єктивне. Якщо ваше право "
-"змінювати програму по суті обмежена лише 
змінами, які хтось інший вважає "
-"поліпшеннями, то ця програма не вільна."
 
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "Однак правила про оформлення 
модифікованих версій припустимі, якщо вони 
суті "
 "не обмежують вашу свободу випускати 
модифіковані версії, а також вашу "
@@ -476,6 +513,10 @@
 "засіб перепризначення, що дозволяє вам 
задати ім'я первісної програми як "
 "перенаправлення на змінену версію."
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -513,6 +554,24 @@
 "проблема, оскільки подальша зміна в 
законодавстві могло б зробити цю вимогу "
 "нетривіальною і тим самим перетворити 
програму на невільну."
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"Щоб ці свободи були дійсні, вони повинні 
бути неперервні і невідкличні до "
+"тих пір, поки ви не робите нічого поганого; 
якщо за розробником програми "
+"залишається право відкликати ліцензію 
або додавати обмеження в її умови "
+"після факту розповсюдження без якого б то 
ні було приводу з вашої сторони, "
+"то програма невільна."
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -536,6 +595,10 @@
 "Для ліцензії вільних програм допустимо 
зазначати, закон якої юрисдикції "
 "застосовний, де повинні проходити судові 
слухання або те і інше."
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -569,6 +632,10 @@
 "правомірний, нам доведеться подумати про 
це, і ми, ймовірно, прийдемо до "
 "висновку, що вона не вільна."
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -590,6 +657,10 @@
 "список вірних <a 
href=\"/philosophy/fs-translations.html\">перекладів "
 "словосполучення &ldquo;вільні 
програми&rdquo;</a> на різні мови."
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -616,6 +687,10 @@
 "ми часто оновлюємо ці критерії, щоб було 
простіше зрозуміти, чому певні "
 "ліцензії задовольняють або не 
відповідають їм."
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.zh-cn-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/free-sw.zh-cn-diff.html  20 Aug 2016 14:58:40 -0000      1.2
+++ po/free-sw.zh-cn-diff.html  16 Nov 2016 21:58:10 -0000      1.3
@@ -22,10 +22,11 @@
 &lt;!--#include virtual="/server/banner.html" --&gt;
 
 &lt;h2&gt;What is free software?&lt;/h2&gt;
-&lt;!--#include virtual="/licenses/fsf-licensing.html" --&gt;
+<span class="removed"><del><strong>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</strong></del></span>
 
 &lt;h3&gt;The Free Software Definition&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 &lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
@@ -62,6 +63,8 @@
 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;
 A program is free software if the program's users have the
 four essential freedoms:
@@ -96,12 +99,23 @@
 handle some cases.  If we plan to distribute A as it stands, that
 implies users will need B, so we need to judge whether both A and B
 are free.  However, if we plan to modify A so that it doesn't use B,
-only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;</em></ins></span>
+only A needs to be free; <span class="removed"><del><strong>we can ignore 
B.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>B is not 
pertinent to that plan.&lt;/p&gt;
+
+&lt;p&gt;
+&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 
+&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;The rest of this page clarifies certain points about what makes
 specific freedoms adequate or not.&lt;/p&gt;
 
-&lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you are free to
+<span class="removed"><del><strong>&lt;p&gt;Freedom to distribute (freedoms 2 
and 3) means you are free to
 redistribute copies, either with or without modifications, either
 gratis or charging a fee for distribution, to
 &lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
@@ -110,11 +124,13 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-You should also have the freedom to make modifications and use them
+You should also have the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>make modifications and use them
 privately in your own work or play, without even mentioning that they
-exist.  If you do publish your changes, you should not be required to
+exist.  If you do publish your changes,</strong></del></span> <span 
class="inserted"><ins><em>run the program as</em></ins></span> you <span 
class="removed"><del><strong>should not be required to
 notify anyone in particular, or in any particular way.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>wish&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 The freedom to run the program means the freedom for any kind of person
@@ -133,16 +149,17 @@
 functionality the program has, or whether it is useful for what you
 want to do.&lt;/p&gt;
 
-&lt;p&gt;
-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
+<span class="removed"><del><strong>&lt;p&gt;
+The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;h4&gt;The</em></ins></span> freedom to 
<span class="removed"><del><strong>redistribute copies must include binary or 
executable
+forms of</strong></del></span> <span 
class="inserted"><ins><em>study</em></ins></span> the <span 
class="removed"><del><strong>program, as well as</strong></del></span> source 
<span class="removed"><del><strong>code, for both 
modified</strong></del></span> <span 
class="inserted"><ins><em>code</em></ins></span> and
+<span class="removed"><del><strong>unmodified versions.  (Distributing 
programs in runnable form is necessary
 for conveniently installable free operating systems.)  It is OK if there
 is no way to produce a binary or executable form for a certain program
 (since some languages don't support that feature), but you must have the
-freedom to redistribute such forms should you find or develop a way to
-make them.
-&lt;/p&gt;
+freedom to redistribute such forms should you find or develop a way 
to</strong></del></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;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -173,6 +190,29 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;h4&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
+gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist.  If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+&lt;/p&gt;
+
+&lt;p&gt;</em></ins></span>
 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
@@ -182,15 +222,26 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-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
-restrictions to its terms, without your doing anything wrong to give
-cause, the software is not free.
+<span class="removed"><del><strong>In order for these 
freedoms</strong></del></span>
+<span class="inserted"><ins><em>The freedom</em></ins></span> to <span 
class="removed"><del><strong>be real, they</strong></del></span> <span 
class="inserted"><ins><em>redistribute copies</em></ins></span> must <span 
class="removed"><del><strong>be permanent and
+irrevocable</strong></del></span> <span class="inserted"><ins><em>include 
binary or executable
+forms of the program,</em></ins></span> as <span 
class="removed"><del><strong>long</strong></del></span> <span 
class="inserted"><ins><em>well</em></ins></span> as <span 
class="inserted"><ins><em>source code, for both modified and
+unmodified versions.  (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.)  It is OK if there
+is no way to produce a binary or executable form for a certain program
+(since some languages don't support that feature), but</em></ins></span> you 
<span class="removed"><del><strong>do nothing wrong; if the developer of the
+software has</strong></del></span> <span class="inserted"><ins><em>must 
have</em></ins></span> the <span 
class="removed"><del><strong>power</strong></del></span>
+<span class="inserted"><ins><em>freedom</em></ins></span> to <span 
class="removed"><del><strong>revoke the license,</strong></del></span> <span 
class="inserted"><ins><em>redistribute such forms should you 
find</em></ins></span> or <span class="removed"><del><strong>retroactively add
+restrictions to its terms, without your doing anything 
wrong</strong></del></span> <span class="inserted"><ins><em>develop a 
way</em></ins></span> to <span class="removed"><del><strong>give
+cause, the software is not free.</strong></del></span>
+<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>
+
 &lt;p&gt;
-However, certain kinds of rules about the manner of distributing free
+<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;
 (very simply stated) is the rule that when redistributing the program,
@@ -212,14 +263,16 @@
 relate to each other.
 &lt;/p&gt;
 
-&lt;p&gt;
+<span class="removed"><del><strong>&lt;p&gt;
 &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 
+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 
 &lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
 &lt;/p&gt;
 
@@ -227,10 +280,11 @@
 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.
-&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>distribution 
details&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
-However, rules about how to package a modified version are acceptable,
+<span class="removed"><del><strong>However, rules</strong></del></span>
+<span class="inserted"><ins><em>Rules</em></ins></span> 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 privately.
 Thus, it is acceptable for the license to require that you change the
@@ -262,6 +316,8 @@
 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>
+
 &lt;p&gt;
 Sometimes government &lt;a id="exportcontrol"&gt;export control 
regulations&lt;/a&gt;
 and trade sanctions can constrain your freedom to distribute copies of
@@ -284,6 +340,16 @@
 software nonfree.
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt;Legal considerations&lt;/h4&gt;
+
+&lt;p&gt;
+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
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+&lt;/p&gt;</em></ins></span>
+
 &lt;p&gt;
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -298,6 +364,8 @@
 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>
+
 &lt;p&gt;
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -317,6 +385,8 @@
 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;
 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
@@ -328,6 +398,8 @@
 &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;
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -342,6 +414,8 @@
 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>
+
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
 software license, see our &lt;a href="/licenses/license-list.html"&gt;list
@@ -582,7 +656,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2016/08/20 14:58:40 $
+$Date: 2016/11/16 21:58:10 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/free-sw.zh-cn.po 20 Aug 2016 14:58:40 -0000      1.15
+++ po/free-sw.zh-cn.po 16 Nov 2016 21:58:10 -0000      1.16
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2015-09-28 23:31-0800\n"
 "Last-Translator: Nan Deng <address@hidden>\n"
 "Language-Team: Simplified Chinese Translation Team\n"
@@ -104,6 +104,10 @@
 "户,而软件的开发者则掌控着软件。 
这使得非自由软件成为了<a href=\"/philosophy/"
 "free-software-even-more-important.html\"> 非正义力量的帮凶</a>。"
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -179,34 +183,35 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
-msgstr "本文着重介绍在哪些情
况下,软件会被认为提供了或剥夺了某个自由度。"
-
-#. type: Content of: <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 "
-"fee for distribution, to <a 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 to do so."
+"&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>."
 msgstr ""
-"自由分发(自由度2和3)意味着你
(即,软件用户)可以把软件原版或修改版再发布给"
-"其他用户。你可以å…
è´¹å‘布,也可以收取费用。软件可以发布给<a href="
-"\"#exportcontrol\">任何地方的任何人</a>。所谓“自由”,意味着ä½
 çš„这些行为(发布"
-"软件原版或修改版给其他用户;或å…
¶ä»–自由度中提及的行为)不必事先征得任何人的许"
-"可,也不必为此额外支付任何费用。"
+"&ldquo; 自由软件 &rdquo; 不等于 &ldquo; 非商业软件 &rdquo; 
。一个自由软件必须"
+"å…
è®¸å•†ä¸šç”¨æˆ·ï¼Œå•†ä¸šå¼€å‘,和商业发布。商业开发自由软件早就司空见惯了,这æ
 ·çš„自"
+"由软件非常重要。你
可能需要花钱购买自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你"
+"如何获得你的拷贝,作为用户,你
的四大自由都会被保证,你可以自由地运行,修改,"
+"发布甚至<a href=\"/philosophy/selling.html\">出售</a>你
拿到的自由软件。"
 
 #. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
+msgstr "本文着重介绍在哪些情
况下,软件会被认为提供了或剥夺了某个自由度。"
+
+#. type: Content of: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to run the program as you wish, for any purpose (freedom 0)."
+msgid "The freedom to run the program as you wish"
 msgstr ""
-"用户可以自由地运行该程序或对程序进行修改。如果仅仅
私下自己修改或运行该程序,"
-"那么你没有义务将该行为公开给任何人。如果你
发布了自己修改后的程序,那么你也没"
-"有任何义务将该修改行为告知给哪个或哪些指定的人或组织。"
+"自由度0:无论用户出于何种目的,必须可以按ç…
§ç”¨æˆ·æ„æ„¿ï¼Œå¯ä»¥éšæ—¶éšå¤„自由地运行该"
+"软件。"
 
 #. type: Content of: <p>
 msgid ""
@@ -235,22 +240,9 @@
 
"“自由地运行程序”意味着没有人可以阻止用户使用该程序做任何事æƒ
…。它并没有规定该"
 "程序必须提供哪些功能特性,也并不意味着软件必
须迎合用户的所有需求。"
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"“自由地分发软件的拷贝”意味着必须å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的原版或用户自己的修改"
-"版。无
论那个版本,用户都可以选择发布程序的二进制或可执行文件,也可以发布程序"
-"的源代ç 
ã€‚(以可执行文件的形式发布程序可以让人方便安装
,这一点对于推广自由软"
-"件也至关重要。)对于某些程序,也许无法或者不必
发布二进制或可执行文件(一些编"
-"程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…须有权利以任何方式生"
-"成二进制或可执行文件,并且发布这些生成的软件。"
 
 #. type: Content of: <p>
 msgid ""
@@ -299,6 +291,49 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr "自由度2:用户可以自由地分发该软件的拷贝。"
+
+#. type: Content of: <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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"自由分发(自由度2和3)意味着你
(即,软件用户)可以把软件原版或修改版再发布给"
+"其他用户。你可以å…
è´¹å‘布,也可以收取费用。软件可以发布给<a href="
+"\"#exportcontrol\">任何地方的任何人</a>。所谓“自由”,意味着ä½
 çš„这些行为(发布"
+"软件原版或修改版给其他用户;或å…
¶ä»–自由度中提及的行为)不必事先征得任何人的许"
+"可,也不必为此额外支付任何费用。"
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"用户可以自由地运行该程序或对程序进行修改。如果仅仅
私下自己修改或运行该程序,"
+"那么你没有义务将该行为公开给任何人。如果你
发布了自己修改后的程序,那么你也没"
+"有任何义务将该修改行为告知给哪个或哪些指定的人或组织。"
+
+#. type: Content of: <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"
@@ -312,24 +347,42 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"“自由地分发软件的拷贝”意味着必须å…
è®¸ç”¨æˆ·è‡ªç”±åœ°å‘布软件的原版或用户自己的修改"
+"版。无
论那个版本,用户都可以选择发布程序的二进制或可执行文件,也可以发布程序"
+"的源代ç 
ã€‚(以可执行文件的形式发布程序可以让人方便安装
,这一点对于推广自由软"
+"件也至关重要。)对于某些程序,也许无法或者不必
发布二进制或可执行文件(一些编"
+"程语言的实现可能并不支持,例如某些脚本语言),但是用户å¿
…须有权利以任何方式生"
+"成二进制或可执行文件,并且发布这些生成的软件。"
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"要让落实这些自由度,只要用户遵守许可证上的要求,那么这些自由度就å¿
…须是长久"
-"的,不可更改的。如果软件的开发者
有权利修改已发布软件的许可证,那么该软件也不"
-"被视为自由软件。"
 
 #. type: Content of: <p>
-msgid ""
-"However, 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."
+#, fuzzy
+#| msgid ""
+#| "However, 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 "
+"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 ""
 "当然,只要不违背这些æ 
¸å¿ƒè‡ªç”±ï¼Œè‡ªç”±è½¯ä»¶è®¸å¯è¯ä¹Ÿå¯ä»¥é¢å¤–添加
一些要求,限制软件"
 "的分发步骤。例如,<a 
href=\"/copyleft/copyleft.html\">copyleft</a>就是常见的"
@@ -354,44 +407,31 @@
 "件分类</a>来了解更多关于 &ldquo; 自由软件 &rdquo; , &ldquo; 
copyleft软件 "
 "&rdquo; 以及其他分类和它们之间的关系。"
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"&ldquo; 自由软件 &rdquo; 不等于 &ldquo; 非商业软件 &rdquo; 
。一个自由软件必须"
-"å…
è®¸å•†ä¸šç”¨æˆ·ï¼Œå•†ä¸šå¼€å‘,和商业发布。商业开发自由软件早就司空见惯了,这æ
 ·çš„自"
-"由软件非常重要。你
可能需要花钱购买自由软件的拷贝,也可能å…
è´¹æ‹¿åˆ°ã€‚但是无论你"
-"如何获得你的拷贝,作为用户,你
的四大自由都会被保证,你可以自由地运行,修改,"
-"发布甚至<a href=\"/philosophy/selling.html\">出售</a>你
拿到的自由软件。"
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"对软件的修改可能是出于各种目的。某个特定的修改究竟是好是坏,这本身是个非常主"
-"观的事情
。自由软件许可证不能对用户修改软件做任何限制,例如,不能ä»
…仅因为某人"
-"觉得哪处修改不够好,就禁止用户自己做这个改动。"
 
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "不过,自由软件可以对修改版的打包
或分发方式做一定的限制。这些限制不得与前面提"
 
"到的四大自由相矛盾,不得直接或间接地限制用户运行,修改或发布软件。例如,某些"
@@ -433,6 +473,10 @@
 
"而文件名则是这种调用的基础。别名机制可以保证用户在遵守该要求的前提下,顺利将"
 
"原版软件替换成修改版,并且不会影响依赖该软件的第三方程序。"
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Sometimes government <a id=\"exportcontrol\">export control regulations</a> "
@@ -466,6 +510,22 @@
 
"不会被视为限制用户的自由。然而,这会存在潜在问题:一旦该条出口限制法律在某个"
 
"用户的所在地区做了修改,那么该许可证也就不被视作自由的。"
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"要让落实这些自由度,只要用户遵守许可证上的要求,那么这些自由度就å¿
…须是长久"
+"的,不可更改的。如果软件的开发者
有权利修改已发布软件的许可证,那么该软件也不"
+"被视为自由软件。"
+
 # "may not" or "should not"?
 #. type: Content of: <p>
 msgid ""
@@ -488,6 +548,10 @@
 "自由软件许可证可以指定与软件相å…
³çš„诉讼需要遵守哪个地区的法律,或需要在哪里提"
 "起诉讼。"
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -516,6 +580,10 @@
 "一些额外限制,并且这些限制是不可能包
含在一份基于版权的许可证中的,那么我们就"
 "需要再三考虑它是否可以被视作自由许可证。很多情
况下,这些许可证都是非自由的。"
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -535,6 +603,10 @@
 "philosophy/fs-translations.html\">列表</a>,包含了 &ldquo; 自由软件 
&rdquo; "
 "一词在不同语言中的推荐翻译。"
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -557,6 +629,10 @@
 
"与。这时候,我们往往需要仔细定夺之后才能给出结论。遇到这æ
 ·çš„许可证,在做出结"
 "论之后,我们很可能会更新本文,把之前没有考虑到的因素
添加进来。"
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "

Index: po/free-sw.zh-tw-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-tw-diff.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/free-sw.zh-tw-diff.html  20 Aug 2016 14:58:40 -0000      1.31
+++ po/free-sw.zh-tw-diff.html  16 Nov 2016 21:58:10 -0000      1.32
@@ -24,10 +24,10 @@
 &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="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 
 &lt;h3&gt;The Free Software Definition&lt;/h3&gt;
 
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/licenses/fsf-licensing.html" --&gt;</em></ins></span>
 &lt;blockquote&gt;
 &lt;p&gt;
 The free software definition presents the criteria for whether a
@@ -74,6 +74,8 @@
 in &ldquo;free speech,&rdquo; not as in &ldquo;free 
beer&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>power&lt;/a&gt;.</em></ins></span>
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt; The four essential 
freedoms&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
 A program is free software if the program's users have the
 four essential freedoms:
@@ -99,36 +101,45 @@
 &lt;p&gt;
 A program is free software if <span class="inserted"><ins><em>it 
gives</em></ins></span> users <span 
class="removed"><del><strong>have</strong></del></span> <span 
class="inserted"><ins><em>adequately</em></ins></span> all of these
 freedoms.  <span class="removed"><del><strong>Thus,
-you should</strong></del></span>  <span class="inserted"><ins><em>Otherwise, 
it is nonfree.  While we can distinguish various
+you should be free</strong></del></span>  <span 
class="inserted"><ins><em>Otherwise, it is nonfree.  While we can distinguish 
various
 nonfree distribution schemes in terms of how far they fall short of
 being free, we consider them all equally unethical.&lt;/p&gt;
 
-&lt;p&gt;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.  If we plan to distribute A as it stands, that
-implies users will need B, so we need to judge whether both A and B
-are free.  However, if we plan to modify A so that it doesn't use B,
-only A needs to</em></ins></span> be <span class="inserted"><ins><em>free; B 
is not pertinent to that plan.&lt;/p&gt;
-
-&lt;p&gt;The rest of this page clarifies certain points about what makes
-specific freedoms adequate or not.&lt;/p&gt;
-
-&lt;p&gt;Freedom to distribute (freedoms 2 and 3) means you 
are</em></ins></span> free to
-redistribute copies, either with or without modifications, either
-gratis or charging a fee for distribution, to
-&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
-things means (among other things) that you do not have to ask or pay
+&lt;p&gt;In any given scenario, these freedoms must apply</em></ins></span> to 
<span class="removed"><del><strong>redistribute copies, either with or without
+modifications, either gratis</strong></del></span> <span 
class="inserted"><ins><em>whatever code
+we plan to make use of,</em></ins></span> or <span 
class="removed"><del><strong>charging</strong></del></span> <span 
class="inserted"><ins><em>lead others to make use of.  For instance,
+consider</em></ins></span> a <span class="removed"><del><strong>fee for 
distribution,</strong></del></span> <span class="inserted"><ins><em>program A 
which automatically launches a program B</em></ins></span> to
+<span class="removed"><del><strong>&lt;a href="#exportcontrol"&gt;anyone 
anywhere&lt;/a&gt;.  Being free</strong></del></span>
+<span class="inserted"><ins><em>handle some cases.  If we 
plan</em></ins></span> to <span class="removed"><del><strong>do these
+things means (among other things)</strong></del></span> <span 
class="inserted"><ins><em>distribute A as it stands,</em></ins></span> that 
<span class="removed"><del><strong>you do not have to ask or pay
 for permission to do so.
 &lt;/p&gt;
 
 &lt;p&gt;
-You should also have the freedom to make modifications and use them
-privately in your own work or play, without even mentioning that they
-exist.  If you do publish your changes, you should not be required to
-notify anyone in particular, or in any particular way.
+You should also have the freedom</strong></del></span>
+<span class="inserted"><ins><em>implies users will need B, so we 
need</em></ins></span> to <span class="removed"><del><strong>make 
modifications</strong></del></span> <span class="inserted"><ins><em>judge 
whether both A</em></ins></span> and <span class="inserted"><ins><em>B
+are free.  However, if we plan to modify A so that it 
doesn't</em></ins></span> use <span class="removed"><del><strong>them
+privately in your own work or play, without even 
mentioning</strong></del></span> <span class="inserted"><ins><em>B,
+only A needs to be free; B is not pertinent to</em></ins></span> that <span 
class="removed"><del><strong>they
+exist.  If you do publish your changes, you should</strong></del></span> <span 
class="inserted"><ins><em>plan.&lt;/p&gt;
+
+&lt;p&gt;
+&ldquo;Free software&rdquo; does</em></ins></span> not <span 
class="inserted"><ins><em>mean &ldquo;noncommercial&rdquo;.  A free
+program must</em></ins></span> be <span 
class="removed"><del><strong>required</strong></del></span> <span 
class="inserted"><ins><em>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</em></ins></span> to
+<span class="removed"><del><strong>notify anyone in 
particular,</strong></del></span> <span class="inserted"><ins><em>get copies of 
free software,</em></ins></span> or <span class="removed"><del><strong>in any 
particular way.</strong></del></span> <span class="inserted"><ins><em>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;.</em></ins></span>
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;p&gt;The rest of this page clarifies 
certain points about what makes
+specific freedoms adequate or not.&lt;/p&gt;
+
+&lt;h4&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
 or organization to use it on any kind of computer system, for any kind of
@@ -141,21 +152,19 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-The freedom to <span class="inserted"><ins><em>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 to do.&lt;/p&gt;
-
-&lt;p&gt;
-The freedom to</em></ins></span> redistribute copies must include binary or 
executable
-forms of the program, as well as source code, for both modified and
+The freedom to <span class="removed"><del><strong>redistribute copies must 
include binary or executable
+forms of</strong></del></span> <span 
class="inserted"><ins><em>run</em></ins></span> the <span 
class="removed"><del><strong>program, as well</strong></del></span> <span 
class="inserted"><ins><em>program</em></ins></span> as <span 
class="removed"><del><strong>source code, for both modified and
 unmodified versions.  (Distributing programs in runnable form is necessary
-for conveniently installable free operating systems.)  It is OK if there
-is no way to produce a binary or executable form for a certain program
-(since some languages don't support that feature), but you must have the
-freedom to redistribute such forms should you find or develop a way to
-make them.
-&lt;/p&gt;
+for conveniently installable free operating systems.)</strong></del></span> 
<span class="inserted"><ins><em>you wish means that you are not
+forbidden or stopped from doing so.</em></ins></span>  It <span 
class="removed"><del><strong>is OK if there
+is no way</strong></del></span> <span class="inserted"><ins><em>has 
nothing</em></ins></span> to <span class="removed"><del><strong>produce a 
binary</strong></del></span> <span class="inserted"><ins><em>do with what
+functionality the program has,</em></ins></span> or <span 
class="removed"><del><strong>executable form</strong></del></span> <span 
class="inserted"><ins><em>whether it is useful</em></ins></span> for <span 
class="removed"><del><strong>a certain program
+(since some languages don't support that feature), but</strong></del></span> 
<span class="inserted"><ins><em>what</em></ins></span> you <span 
class="removed"><del><strong>must have the
+freedom</strong></del></span>
+<span class="inserted"><ins><em>want</em></ins></span> to <span 
class="removed"><del><strong>redistribute such forms should you find or develop 
a way</strong></del></span> <span class="inserted"><ins><em>do.&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;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>changes&lt;/h4&gt;</em></ins></span>
 
 &lt;p&gt;
 In order for freedoms 1 and 3 (the freedom to make changes and the
@@ -187,8 +196,33 @@
 &lt;/p&gt;
 
 &lt;p&gt;
+<span class="removed"><del><strong>Freedom 3 includes the freedom to release 
your modified versions
+as free</strong></del></span>
+<span class="inserted"><ins><em>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.
+&lt;/p&gt;
+
+&lt;h4&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
+gratis or charging a fee for distribution, to
+&lt;a href="#exportcontrol"&gt;anyone anywhere&lt;/a&gt;.  Being free to do 
these
+things means (among other things) that you do not have to ask or pay
+for permission to do so.
+&lt;/p&gt;
+
+&lt;p&gt;
+You should also have the freedom to make modifications and use them
+privately in your own work or play, without even mentioning that they
+exist.  If you do publish your changes, you should not be required to
+notify anyone in particular, or in any particular way.
+&lt;/p&gt;
+
+&lt;p&gt;
 Freedom 3 includes the freedom to release your modified versions
-as free software.  A free license may also permit other ways of
+as free</em></ins></span> 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
 license that requires modified versions to be nonfree does not qualify
@@ -196,55 +230,69 @@
 &lt;/p&gt;
 
 &lt;p&gt;
-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
-restrictions to its terms, without your doing anything wrong to give
-cause, the software is not free.
+<span class="removed"><del><strong>In order for these 
freedoms</strong></del></span>
+<span class="inserted"><ins><em>The freedom</em></ins></span> to <span 
class="removed"><del><strong>be real, they</strong></del></span> <span 
class="inserted"><ins><em>redistribute copies</em></ins></span> must <span 
class="removed"><del><strong>be permanent and
+irrevocable</strong></del></span> <span class="inserted"><ins><em>include 
binary or executable
+forms of the program,</em></ins></span> as <span 
class="removed"><del><strong>long</strong></del></span> <span 
class="inserted"><ins><em>well</em></ins></span> as <span 
class="removed"><del><strong>you do nothing wrong;</strong></del></span> <span 
class="inserted"><ins><em>source code, for both modified and
+unmodified versions.  (Distributing programs in runnable form is necessary
+for conveniently installable free operating systems.)  It is 
OK</em></ins></span> if <span class="removed"><del><strong>the developer of the
+software has the power</strong></del></span> <span 
class="inserted"><ins><em>there
+is no way</em></ins></span> to <span class="removed"><del><strong>revoke the 
license,</strong></del></span> <span class="inserted"><ins><em>produce a 
binary</em></ins></span> or <span class="removed"><del><strong>retroactively add
+restrictions</strong></del></span> <span class="inserted"><ins><em>executable 
form for a certain program
+(since some languages don't support that feature), but you must have the
+freedom</em></ins></span> to <span class="removed"><del><strong>its terms, 
without your doing anything wrong</strong></del></span> <span 
class="inserted"><ins><em>redistribute such forms should you find or develop a 
way</em></ins></span> to <span class="removed"><del><strong>give
+cause, the software is not free.</strong></del></span>
+<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>
+
 &lt;p&gt;
-However, certain kinds of rules about the manner of distributing free
+<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>
-(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.
+(very simply stated) is the rule that
+<span class="removed"><del><strong>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.
 &lt;/p&gt;
 
 &lt;p&gt;
-<span class="inserted"><ins><em>In the GNU project, we use copyleft to protect 
the four freedoms
-legally for everyone.  We believe there are important reasons why
-&lt;a href="/philosophy/pragmatic.html"&gt;it is better to use
-copyleft&lt;/a&gt;.  However,
-&lt;a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;
-noncopylefted free software&lt;/a&gt; is ethical
-too.  See &lt;a href="/philosophy/categories.html"&gt;Categories of Free
-Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo;
-&ldquo;copylefted software&rdquo; and other categories of software
-relate to each other.
-&lt;/p&gt;
-
-&lt;p&gt;</em></ins></span>
 &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 
-&lt;a href="/philosophy/selling.html"&gt;sell copies&lt;/a&gt;.
+you always have</strong></del></span> <span class="inserted"><ins><em>when 
redistributing</em></ins></span> the <span 
class="removed"><del><strong>freedom</strong></del></span> <span 
class="inserted"><ins><em>program,
+you cannot add restrictions</em></ins></span> to <span 
class="removed"><del><strong>copy and change</strong></del></span> <span 
class="inserted"><ins><em>deny other people</em></ins></span> the <span 
class="removed"><del><strong>software, even to 
+&lt;a href="/philosophy/selling.html"&gt;sell 
copies&lt;/a&gt;.</strong></del></span> <span class="inserted"><ins><em>central 
freedoms.
+This rule does not conflict with the central freedoms; rather it
+protects them.</em></ins></span>
 &lt;/p&gt;
 
 &lt;p&gt;
-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.
+<span class="removed"><del><strong>Whether a change constitutes an improvement 
is a subjective matter.
+If your right</strong></del></span>
+<span class="inserted"><ins><em>In the GNU project, we use 
copyleft</em></ins></span> to <span class="removed"><del><strong>modify a 
program</strong></del></span> <span class="inserted"><ins><em>protect the four 
freedoms
+legally for everyone.  We believe there are important reasons why
+&lt;a href="/philosophy/pragmatic.html"&gt;it</em></ins></span> is <span 
class="removed"><del><strong>limited, in substance,</strong></del></span> <span 
class="inserted"><ins><em>better</em></ins></span> to <span 
class="removed"><del><strong>changes that
+someone else considers an improvement, that program</strong></del></span> 
<span class="inserted"><ins><em>use
+copyleft&lt;/a&gt;.  However,
+&lt;a href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;
+noncopylefted free software&lt;/a&gt;</em></ins></span> is <span 
class="removed"><del><strong>not free.</strong></del></span> <span 
class="inserted"><ins><em>ethical
+too.  See &lt;a href="/philosophy/categories.html"&gt;Categories of Free
+Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo;
+&ldquo;copylefted software&rdquo; and other categories of software
+relate to each other.</em></ins></span>
 &lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;h4&gt;Rules about packaging and 
distribution details&lt;/h4&gt;</em></ins></span>
+
 &lt;p&gt;
-However, rules about how to package a modified version are acceptable,
+<span class="removed"><del><strong>However, rules</strong></del></span>
+<span class="inserted"><ins><em>Rules</em></ins></span> 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 privately.
 Thus, it is acceptable for the license to require that you change the
@@ -252,20 +300,19 @@
 modifications as yours.  As long as these requirements are not so
 burdensome that they effectively hamper you from releasing your
 changes, they are acceptable; you're already making other changes to
-the program, so you <span class="removed"><del><strong>won't have trouble 
making a few more.
+the program, so you won't have trouble making a few more.
 &lt;/p&gt;
 
 &lt;p&gt;
-A special issue arises when a license requires changing the name by
+<span class="removed"><del><strong>A special issue arises when a license 
requires changing the name by
 which the program will be invoked from other programs.  That
 effectively hampers you from releasing your changed version so that it
 can replace the original when invoked by those other programs.  This
 sort of requirement is acceptable only if there's a suitable aliasing
 facility that allows you to specify the original program's name as an
-alias for the modified version.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>won't have trouble making a few more.
-&lt;/p&gt;</em></ins></span>
+alias for the modified version.&lt;/p&gt;
 
-&lt;p&gt;
+&lt;p&gt;</strong></del></span>
 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 condition.  An example of such an acceptable rule is one
@@ -279,21 +326,23 @@
 
 &lt;p&gt;
 <span class="removed"><del><strong>In</strong></del></span>
-<span class="inserted"><ins><em>A special issue arises when a license requires 
changing the name by
-which</em></ins></span> the <span class="removed"><del><strong>GNU project, we 
use 
+<span class="inserted"><ins><em>A special issue arises when a license requires 
changing</em></ins></span> the <span class="removed"><del><strong>GNU project, 
we use 
 &lt;a href="/copyleft/copyleft.html"&gt;copyleft&lt;/a&gt;
 to protect these freedoms legally for everyone.  But 
 &lt;a 
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware"&gt;noncopylefted
 free software&lt;/a&gt; also exists.  We believe there are important reasons 
why
 &lt;a href="/philosophy/pragmatic.html"&gt;it is better to use 
copyleft&lt;/a&gt;,
-but if your</strong></del></span> program <span 
class="removed"><del><strong>is noncopylefted free 
software,</strong></del></span> <span class="inserted"><ins><em>will be invoked 
from other programs.  That
-effectively hampers you from releasing your changed version so 
that</em></ins></span> it <span class="removed"><del><strong>is still basically
+but if</strong></del></span> <span class="inserted"><ins><em>name by
+which the program will be invoked from other programs.  That
+effectively hampers you from releasing</em></ins></span> your <span 
class="removed"><del><strong>program is noncopylefted free 
software,</strong></del></span> <span class="inserted"><ins><em>changed version 
so that</em></ins></span> it <span class="removed"><del><strong>is still 
basically
 ethical. (See &lt;a href="/philosophy/categories.html"&gt;Categories of Free 
Software&lt;/a&gt; for a description of how &ldquo;free software,&rdquo; 
&ldquo;copylefted software&rdquo; and</strong></del></span>
 <span class="inserted"><ins><em>can replace the original when invoked by 
those</em></ins></span> other <span 
class="removed"><del><strong>categories</strong></del></span> <span 
class="inserted"><ins><em>programs.  This
 sort</em></ins></span> of <span class="removed"><del><strong>software 
relate</strong></del></span> <span class="inserted"><ins><em>requirement is 
acceptable only if there's a suitable aliasing
 facility that allows you</em></ins></span> to <span 
class="removed"><del><strong>each other.)
 &lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>specify the 
original program's name as an
-alias for the modified version.&lt;/p&gt;</em></ins></span>
+alias for the modified version.&lt;/p&gt;
+
+&lt;h4&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;
@@ -317,6 +366,16 @@
 software nonfree.
 &lt;/p&gt;
 
+&lt;h4&gt;Legal considerations&lt;/h4&gt;
+
+&lt;p&gt;
+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
+restrictions to its terms, without your doing anything wrong to give
+cause, the software is not free.
+&lt;/p&gt;
+
 &lt;p&gt;
 A free license may not require compliance with the license of a
 nonfree program.  Thus, for instance, if a license requires you to
@@ -331,6 +390,8 @@
 law applies, or where litigation must be done, or both.
 &lt;/p&gt;
 
+&lt;h4&gt;Contract-based licenses&lt;/h4&gt;
+
 &lt;p&gt;</em></ins></span>
 Most free software licenses are based on copyright, and there are limits
 on what kinds of requirements can be imposed through copyright.  If a
@@ -350,6 +411,8 @@
 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;
 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
@@ -361,6 +424,8 @@
 &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;
 Finally, note that criteria such as those stated in this free software
 definition require careful thought for their interpretation.  To decide
@@ -375,6 +440,8 @@
 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>
+
 &lt;p&gt;
 If you are interested in whether a specific license qualifies as a free
 software license, see our &lt;a href="/licenses/license-list.html"&gt;list
@@ -635,7 +702,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2016/08/20 14:58:40 $
+$Date: 2016/11/16 21:58:10 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/free-sw.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-tw.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- po/free-sw.zh-tw.po 20 Aug 2016 14:58:40 -0000      1.35
+++ po/free-sw.zh-tw.po 16 Nov 2016 21:58:10 -0000      1.36
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-sw.html\n"
-"POT-Creation-Date: 2016-08-20 14:55+0000\n"
+"POT-Creation-Date: 2016-11-16 21:55+0000\n"
 "PO-Revision-Date: 2013-03-03 13:54+0800\n"
 "Last-Translator: Karl Lam <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
@@ -99,6 +99,10 @@
 "  如果使用者
不能控制軟體,就會反被軟體操控,而軟體開發者
就可以透過軟體操控"
 "使用者
。這些不自由(nonfree)或專有(proprietary)的軟體就成為不å…
¬ç¾©å‹¢åŠ›çš„利器。"
 
+#. type: Content of: <h4>
+msgid "The four essential freedoms"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "A program is free software if the program's users have the four essential "
@@ -155,39 +159,30 @@
 
 #. type: Content of: <p>
 msgid ""
-"The rest of this page clarifies certain points about what makes specific "
-"freedoms adequate or not."
+"&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>."
 msgstr ""
+"  「自由軟體」不代表「非商業用途」。自由軟體必
需要容許作商業用途。現在商業"
+"的自由軟體開發已經十分常見,而且十分重要。你或者
曾付款購買自由軟體的複製本,"
+"或者免費獲得;無論軟體來自何方,你
一定有修改、複製、售賣軟體的自由。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "A program is free software if users have all of these freedoms.  Thus, "
-#| "you should be free to redistribute copies, either with or without "
-#| "modifications, either gratis or charging a fee for distribution, to <a "
-#| "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 to do so."
 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 "
-"fee for distribution, to <a 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 to do so."
+"The rest of this page clarifies certain points about what makes specific "
+"freedoms adequate or not."
 msgstr ""
-"  如果使用者有以上的自由,那程式就是自由軟體。你
有自由用任何方式發佈副本給"
-"ä»»<a 
href=\"#exportcontrol\">何地方的所有人</a>,不論是原封不動還是修改過的版"
-"本、不論是å…
è²»é‚„是收費。自由的意思是不用給任何人同意、或付費取得權限。"
 
-#. type: Content of: <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 "
-"exist.  If you do publish your changes, you should not be required to notify "
-"anyone in particular, or in any particular way."
-msgstr ""
-"  你也有私下修改及使用自由軟體的自由,而且不必
提及這件事。如果你發表這些修"
-"改,也不必以任何方式通知任何人。"
+#. type: Content of: <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 "  以任何目的運行該程式 (自由0)<a 
href=\"#trans2\">[按2]</a>。"
 
 #. type: Content of: <p>
 msgid ""
@@ -212,20 +207,9 @@
 "program has, or whether it is useful for what you want to do."
 msgstr ""
 
-#. type: Content of: <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 "
-"versions.  (Distributing programs in runnable form is necessary for "
-"conveniently installable free operating systems.)  It is OK if there is no "
-"way to produce a binary or executable form for a certain program (since some "
-"languages don't support that feature), but you must have the freedom to "
-"redistribute such forms should you find or develop a way to make them."
+#. type: Content of: <h4>
+msgid "The freedom to study the source code and make changes"
 msgstr ""
-"  發佈軟體的自由必需包括程式的二進制或可執行形式<a 
href=\"#trans3\">[按3]</"
-"a>、和代碼、原版及修改後的版本。(以可執行形式發佈軟體十分重要,可以使自由的操"
-"作系統更方便安裝)有些例外是軟體所採用的編程言語沒有可執行形式的功能,但ä½
 ä¸€å®š"
-"要有自由發佈那種形式。"
 
 #. type: Content of: <p>
 msgid ""
@@ -279,6 +263,53 @@
 
 #. type: Content of: <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: <h4>
+#, fuzzy
+#| msgid ""
+#| "The freedom to redistribute copies so you can help your neighbor (freedom "
+#| "2)."
+msgid "The freedom to redistribute if you wish: basic requirements"
+msgstr "  隨意發佈軟體副本以幫助別人 (自由2)。"
+
+#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "A program is free software if users have all of these freedoms.  Thus, "
+#| "you should be free to redistribute copies, either with or without "
+#| "modifications, either gratis or charging a fee for distribution, to <a "
+#| "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 to do so."
+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 "
+"fee for distribution, to <a 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 to do so."
+msgstr ""
+"  如果使用者有以上的自由,那程式就是自由軟體。你
有自由用任何方式發佈副本給"
+"ä»»<a 
href=\"#exportcontrol\">何地方的所有人</a>,不論是原封不動還是修改過的版"
+"本、不論是å…
è²»é‚„是收費。自由的意思是不用給任何人同意、或付費取得權限。"
+
+#. type: Content of: <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 "
+"exist.  If you do publish your changes, you should not be required to notify "
+"anyone in particular, or in any particular way."
+msgstr ""
+"  你也有私下修改及使用自由軟體的自由,而且不必
提及這件事。如果你發表這些修"
+"改,也不必以任何方式通知任何人。"
+
+#. type: Content of: <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"
@@ -291,14 +322,22 @@
 
 #. type: Content of: <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 "
-"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."
+"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 "
+"conveniently installable free operating systems.)  It is OK if there is no "
+"way to produce a binary or executable form for a certain program (since some "
+"languages don't support that feature), but you must have the freedom to "
+"redistribute such forms should you find or develop a way to make them."
+msgstr ""
+"  發佈軟體的自由必需包括程式的二進制或可執行形式<a 
href=\"#trans3\">[按3]</"
+"a>、和代碼、原版及修改後的版本。(以可執行形式發佈軟體十分重要,可以使自由的操"
+"作系統更方便安裝)有些例外是軟體所採用的編程言語沒有可執行形式的功能,但ä½
 ä¸€å®š"
+"要有自由發佈那種形式。"
+
+#. type: Content of: <h4>
+msgid "Copyleft"
 msgstr ""
-"  要落實這些自由,自由的許可證必
需是不可逆轉的;如果開發者可以廢除許可證,"
-"或加逆向增加限制條款,這個都不是自由軟體。"
 
 #. type: Content of: <p>
 #, fuzzy
@@ -310,12 +349,12 @@
 #| "other people the central freedoms.  This rule does not conflict with the "
 #| "central freedoms; rather it protects them."
 msgid ""
-"However, 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."
+"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."
 msgstr ""
 "  然而,不限制核心自由的規則是可以接受的。例如公å…
±ç‰ˆæ¬Šè¦å®šäº†ç™¼ä½ˆç¨‹å¼æ™‚,不"
 "能限制別人的核心自由。這規定就沒有跟æ 
¸å¿ƒè‡ªç”±æ²–突,而且還加強保護。"
@@ -351,41 +390,31 @@
 "categories.html\">自由軟體</a>分類了解「自由軟體」、「公å…
±ç‰ˆæ¬Šè»Ÿé«”」及其他種"
 "類軟體的關係。)"
 
-#. type: Content of: <p>
-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>."
-msgstr ""
-"  「自由軟體」不代表「非商業用途」。自由軟體必
需要容許作商業用途。現在商業"
-"的自由軟體開發已經十分常見,而且十分重要。你或者
曾付款購買自由軟體的複製本,"
-"或者免費獲得;無論軟體來自何方,你
一定有修改、複製、售賣軟體的自由。"
-
-#. type: Content of: <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."
+#. type: Content of: <h4>
+msgid "Rules about packaging and distribution details"
 msgstr ""
-"  對軟體的修改是否屬於改進是主觀的問題。如果你
修改程式的權利受到限制,無論"
-"之前的修改有多大的改進,也不能算是自由軟體。"
 
 #. type: Content of: <p>
-msgid ""
-"However, 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 privately.  Thus, it is "
-"acceptable for the license to require that you change the name of the "
-"modified version, remove a logo, or identify your modifications as yours.  "
-"As long as these requirements are not so burdensome that they effectively "
-"hamper you from releasing your changes, they are acceptable; you're already "
-"making other changes to the program, so you won't have trouble making a few "
-"more."
+#, fuzzy
+#| msgid ""
+#| "However, 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 privately.  Thus, it is "
+#| "acceptable for the license to require that you change the name of the "
+#| "modified version, remove a logo, or identify your modifications as "
+#| "yours.  As long as these requirements are not so burdensome that they "
+#| "effectively hamper you from releasing your changes, they are acceptable; "
+#| "you're already making other changes to the program, so you won't have "
+#| "trouble making a few more."
+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 "
+"freedom to make and use modified versions privately.  Thus, it is acceptable "
+"for the license to require that you change the name of the modified version, "
+"remove a logo, or identify your modifications as yours.  As long as these "
+"requirements are not so burdensome that they effectively hamper you from "
+"releasing your changes, they are acceptable; you're already making other "
+"changes to the program, so you won't have trouble making a few more."
 msgstr ""
 "  然而,如果沒有限制你
發放或私人使用修改版本的自由,規定打包修改版本的方式"
 "是可接受的。只要不妨礙你發佈修改版本,許可證要求你
對修改版本更改名稱、移除圖"
@@ -421,6 +450,10 @@
 "修改的版本代替原版的功能。這類要一定要發佈者
提供適當的措施把修改了的程式的名"
 "稱聯繫到原版的名稱,不則不能接受。"
 
+#. type: Content of: <h4>
+msgid "Export regulations"
+msgstr ""
+
 #. type: Content of: <p>
 #, fuzzy
 #| msgid ""
@@ -459,6 +492,21 @@
 "requirement nontrivial and thus render the software nonfree."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Legal considerations"
+msgstr ""
+
+#. type: Content of: <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 "
+"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."
+msgstr ""
+"  要落實這些自由,自由的許可證必
需是不可逆轉的;如果開發者可以廢除許可證,"
+"或加逆向增加限制條款,這個都不是自由軟體。"
+
 #. type: Content of: <p>
 msgid ""
 "A free license may not require compliance with the license of a nonfree "
@@ -474,6 +522,10 @@
 "applies, or where litigation must be done, or both."
 msgstr ""
 
+#. type: Content of: <h4>
+msgid "Contract-based licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Most free software licenses are based on copyright, and there are limits on "
@@ -500,6 +552,10 @@
 "  我們無法列舉所有的情
況。如果上述的許可證以不常見的方法限制使用者,就要重"
 "新審視,大概我們都會認為這不是自由軟體。"
 
+#. type: Content of: <h4>
+msgid "Use the right words when talking about free software"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "When talking about free software, it is best to avoid using terms like "
@@ -517,6 +573,10 @@
 "語</a>的討論。我們也有張<a 
href=\"/philosophy/fs-translations.html\">翻譯「自"
 "由軟體」到不同語言</a>的清單。"
 
+#. type: Content of: <h4>
+msgid "How we interpret these criteria"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "Finally, note that criteria such as those stated in this free software "
@@ -537,6 +597,10 @@
 
"詢律師才能下判斷。當我們給新問題下定論,就會更新這些準則令大家容易了解這些原"
 "因。"
 
+#. type: Content of: <h4>
+msgid "Get help with free licenses"
+msgstr ""
+
 #. type: Content of: <p>
 msgid ""
 "If you are interested in whether a specific license qualifies as a free "



reply via email to

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