www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www licenses/license-list.fr.html licenses/lice...

From: GNUN
Subject: www licenses/license-list.fr.html licenses/lice...
Date: Fri, 11 Apr 2014 19:02:59 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/04/11 19:02:59

Modified files:
        licenses       : license-list.fr.html license-list.ru.html 
        licenses/po    : license-list.fr-en.html license-list.ru-en.html 
        philosophy     : proprietary-sabotage.ru.html 
        philosophy/po  : proprietary-sabotage.ru-en.html 
                         proprietary-sabotage.ru.po 
        server         : sitemap.ar.html sitemap.de.html sitemap.es.html 
                         sitemap.fr.html sitemap.ja.html sitemap.nl.html 
                         sitemap.ro.html sitemap.ru.html sitemap.sq.html 
                         sitemap.uk.html 
        server/po      : sitemap.es-en.html sitemap.fr-en.html 
                         sitemap.ru-en.html sitemap.uk-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.fr.html?cvsroot=www&r1=1.172&r2=1.173
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr-en.html?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/proprietary-sabotage.ru.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary-sabotage.ru-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary-sabotage.ru.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ar.html?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.de.html?cvsroot=www&r1=1.199&r2=1.200
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.es.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.fr.html?cvsroot=www&r1=1.205&r2=1.206
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ja.html?cvsroot=www&r1=1.171&r2=1.172
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.nl.html?cvsroot=www&r1=1.121&r2=1.122
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ro.html?cvsroot=www&r1=1.119&r2=1.120
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ru.html?cvsroot=www&r1=1.140&r2=1.141
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.sq.html?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.uk.html?cvsroot=www&r1=1.138&r2=1.139
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.es-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.fr-en.html?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ru-en.html?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.uk-en.html?cvsroot=www&r1=1.20&r2=1.21

Patches:
Index: licenses/license-list.fr.html
===================================================================
RCS file: /web/www/www/licenses/license-list.fr.html,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- licenses/license-list.fr.html       5 Apr 2014 08:14:31 -0000       1.172
+++ licenses/license-list.fr.html       11 Apr 2014 19:02:55 -0000      1.173
@@ -9,10 +9,82 @@
 <title>Liste des licences avec commentaires - Projet GNU - Free Software 
Foundation</title>
 
 <!--#include virtual="/licenses/po/license-list.translist" -->
+<style type="text/css" media="print,screen">
+<!--
+/* These statements are commented out in HTML to
+   make them untranslatable.  */
+/* Definitions for color-coded border */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+   padding-left: 1em;
+   margin-left: 0;
+   margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double  blue; }
+
+/* Disable legend for CSS1-only browsers:
+   they don't support :before and :after */
+#content div#legend { display: none; }
+/* Enable legend for CSS2+ browsers. */
address@hidden print,screen {
+#content div#legend { display: block; }
+}
+#content div#legend {
+   float: right;
+   width: auto; max-width: 100%;
+   font-style: normal;
+   padding: 0 1em 1em 1em;
+   margin: 1.5em 0 1em 1em;
+   background: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#content div#legend dt { padding: 1em 0; margin: 0; }
+#content div#legend dd { margin: 0; }
+
+#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center; 
font-weight: bold; }
+#legend dl.green dt:after, #legend dl.orange dt:after,
+#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+-->
+
+</style>
+
+<!-- These statements are split between different <style>
+ elements,
+     and their contents aren't commented out on purpose:
+     they should be translated, preferably as separate strings.  -->
+<style type="text/css" media="print,screen">
+#legend blockquote:before { content: "Code de la marge gauche"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.green dt:after {
+   content: "Licences libres compatibles avec GPL ou FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.orange dt:after {
+   content: "Licences libres incompatibles avec GPL et FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.red dt:after { content: "Licences non libres"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.blue dt:after { content: "Licences pour les œuvres d'opinion"; }
+</style>
+
 <!--#include virtual="/server/banner.fr.html" -->
 <h2>Licences commentées</h2>
 
-<h3><a id="TableOfContents">Table des matières</a></h3>
+
+<div class="toc">
+
+<h3 id="TableOfContents">Table des matières</h3>
 
 <ul>
 <li><a href="#Introduction">Introduction</a></li>
@@ -36,16 +108,22 @@
   </ul>
 </li>
 
-<li><a href="#OtherLicenses">Licences pour les œuvres à usage pratique autres
-que les logiciels et la documentation</a>
-    <ul><li><a href="#Fonts">Licences pour les polices de 
caractères</a></li></ul>
-    </li>
-<li><a href="#OpinionLicenses">Licences pour les œuvres présentant un point 
de
+<li><a href="#Fonts">Licences pour les autres types d'œuvres</a>
+  <ul>
+  <li><a href="#OtherLicenses">Licences pour les œuvres à usage pratique 
autres
+que les logiciels et la documentation</a></li>
+  <li><a href="#Fonts">Licences pour les polices de caractères</a></li>
+  <li><a href="#OpinionLicenses">Licences pour les œuvres présentant un 
point de
 vue (par exemple une opinion ou un témoignage)</a></li>
+  </ul>
+</li>
 </ul>
 
+</div>
 
-<h2><a id="Introduction">Introduction</a></h2>
+<!-- /class="toc" -->
+<h3  id="Introduction" class="big-section">
+    Introduction</h3>
 
 <p>Nous classons une licence selon plusieurs critères :</p>
 
@@ -107,19 +185,33 @@
 libre, avec les renseignements sur leur licence.</p>
 
 
-<h2><a id="SoftwareLicenses">Licences de logiciel</a></h2>
+<div id="legend">
+<blockquote></blockquote>
+<dl class="green"><dt></dt><dd></dd></dl>
+<dl class="orange"><dt></dt><dd></dd></dl>
+<dl class="red"><dt></dt><dd></dd></dl>
+<dl class="blue"><dt></dt><dd></dd></dl>
+</div>
+
+<div>
+<h3 id="SoftwareLicenses" class="big-section">
+     Licences de logiciel</h3>
+</div>
+
 
-<h3><a id="FreeLicenses"></a> <a id="GPLCompatibleLicenses">Licences de 
logiciel
-libre compatibles avec la GPL</a> <span class="anchor-reference-id"> (<a
+<h4 id="GPLCompatibleLicenses" class="big-subsection">
+    <span id="FreeLicenses"></span> Licences de logiciel libre compatibles avec
+la GPL</h4>
+<span class="anchor-reference-id"> (<a
 href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>Voici une liste de licences qui remplissent les critères du <a
 href="/philosophy/free-sw.html">logiciel libre</a> et qui sont compatibles
 avec la <a href="#GNUGPL">GNU GPL</a> :</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><!-- both generic and version-specific anchors -->
 <a id="GNUGPL"></a> <a id="GNUGPLv3" href="/licenses/gpl.html"> GNU General
 Public License (GPL), version 3</a>  <span class="anchor-reference-id">(<a
@@ -889,20 +981,22 @@
 
 </dl>
 
+<!-- end class "green" -->
+<hr class="separator" />
+
 
-<hr />
-<h3><a id="GPLIncompatibleLicenses">Licences de logiciel libre incompatibles
-avec la GPL</a> <span class="anchor-reference-id"> (<a
+<h4 id="GPLIncompatibleLicenses" class="big-subsection">
+    Licences de logiciel libre incompatibles avec la GPL</h4>
+<span class="anchor-reference-id"> (<a
 href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>Les licences suivantes constituent des <a
 href="/philosophy/free-sw.html">licences de logiciel libre</a> mais sont <a
 href="/licenses/gpl-faq.html#WhatIsCompatible"><em>incompatibles</em></a>
 avec la <a href="#GNUGPL">GNU GPL</a> :</strong></p>
 
+<dl class="orange">
 
-<dl>
 <dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1";> 
Affero
 General Public License, version 1</a> <span class="anchor-reference-id">(<a
 href="#AGPLv1.0">#AGPLv1.0</a>)</span></dt>
@@ -1487,13 +1581,15 @@
 
 </dl>
 
+<!-- end class="orange -->
+<hr class="separator" />
 
-<hr />    
-<!-- first id is singular, leave for compatibility: -->
-<h3><a id="NonFreeSoftwareLicense"></a> <a id="NonFreeSoftwareLicenses">
-Licences de logiciel non libre</a> <span class="anchor-reference-id"> (<a
+<span id="NonFreeSoftwareLicense"></span>
+<h4><a id="NonFreeSoftwareLicenses" class="big-subsection"> Licences de 
logiciel
+non libre</a></h4>
+<span class="anchor-reference-id"> (<a
 href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-</h3>
+
 
 <p><strong>Les licences suivantes <em>ne méritent pas</em> l'appellation de <a
 href="/philosophy/free-sw.html">licences de logiciel libre</a>. Ces licences
@@ -1520,7 +1616,8 @@
 estimons pouvoir le faire sans risque.</p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="NoLicense">Aucune license</a> <span class="anchor-reference-id"> (<a
 href="#NoLicense">#NoLicense</a>)</span></dt>
 <dd>
@@ -1940,19 +2037,25 @@
 
 </dl>
 
-<h2><a id="DocumentationLicenses">Licences pour la documentation</a></h2>
+<!-- end class="red" -->
+<div>
+<h3 id="DocumentationLicenses" class="big-section">
+    Licences pour la documentation</h3>
+</div>
+
 
-<h3><a id="FreeDocumentationLicenses">Licences libres pour la documentation</a>
+<h4 id="FreeDocumentationLicenses" class="big-subsection">
+    Licences libres pour la documentation</h4>
 <span class="anchor-reference-id"> (<a
 href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>)  </span>
-</h3>
 
 <p><strong>Voici une liste de licences que l'on peut qualifier de <a
 href="/philosophy/free-doc.html">licences de documentation
 libre</a> :</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="FDL" href="/licenses/fdl.html"> GNU Free Documentation License</a>
 <span class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
 <dd>
@@ -1964,6 +2067,19 @@
 celui de l'écrit, celui des « livres ».</p></dd>
 
 
+<dt><a id="FreeBSDDL"
+href="http://directory.fsf.org/wiki?title=License:FreeBSD";> FreeBSD
+Documentation License</a> <span class="anchor-reference-id"> (<a
+href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
+<dd>
+<p>C'est une licence libre pour la documentation, permissive et sans copyleft,
+compatible avec la GNU FDL.</p></dd>
+
+</dl> 
+<!-- end class="green" -->
+<dl class="orange">
+
+
 <dt><a id="ACDL"
 href="http://fedoraproject.org/wiki/Licensing/Common_Documentation_License";>
 Apple's Common Documentation License, version 1.0</a> <span
@@ -1975,15 +2091,6 @@
 prévues par l'ACDL.</p></dd>
 
 
-<dt><a id="FreeBSDDL"
-href="http://directory.fsf.org/wiki?title=License:FreeBSD";> FreeBSD
-Documentation License</a> <span class="anchor-reference-id"> (<a
-href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
-<dd>
-<p>C'est une licence libre pour la documentation, permissive et sans copyleft,
-compatible avec la GNU FDL.</p></dd>
-
-
 <dt><!-- old id, leave for compatibility -->
 <a id="RealOPL"></a> <a id="OpenPublicationL"
 href="http://opencontent.org/openpub/";> Open Publication License,
@@ -2023,19 +2130,22 @@
 
 </dl>
 
+<!-- end class="orange" -->
+<hr class="separator" />
+
 
-<hr />
-<h3><a id="NonFreeDocumentationLicenses">Licences non libres pour la
-documentation</a> <span class="anchor-reference-id"> (<a
+<h4 id="NonFreeDocumentationLicenses" class="big-subsection">
+    Licences non libres pour la documentation</h4>
+<span class="anchor-reference-id"> (<a
 href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
 </span>
-</h3>
 
 <p><strong>Voici une liste de licences qui <em>ne peuvent pas</em> être
 qualifiées de licence de documentation libres :</strong></p>
 
 
-<dl>
+<dl class="red">
+
 <dt><!-- brief id, leave for compatibility -->
 <a id="OCL"></a> <a id="OpenContentL"
 href="http://opencontent.org/opl.shtml";> Open Content License,
@@ -2054,13 +2164,18 @@
 
 </dl>
 
-<h2><a id="OtherLicenses">Licences pour les œuvres à usage pratique autres 
que
-les logiciels et la documentation</a> <span class="anchor-reference-id"> (<a
+<!-- end class="red" -->
+<div>
+<h3 id="OtherLicenses" class="big-section">Licences pour les autres types 
d'œuvres</h3>
+</div>
+
+<h4 class="big-subsection">Licences pour les œuvres à usage pratique autres 
que les logiciels et la
+documentation</h4>
+<span class="anchor-reference-id"> (<a
 href="#OtherLicenses">#OtherLicenses</a>)</span>
-</h2>
 
+<dl class="green">
 
-<dl>
 <dt><a id="GPLOther" href="/licenses/gpl.html"> GNU General Public License</a>
 <span class="anchor-reference-id"> (<a
 href="#GPLOther">#GPLOther</a>)</span></dt>
@@ -2085,6 +2200,10 @@
 encyclopédies, et tous les autres ouvrages destinés à fournir de
 l'information pour un usage concret.</p></dd>
 
+</dl> 
+<!-- end class="green" -->
+<dl  class="orange">
+
 
 <dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
 Licence Creative Commons paternité 2.0</a>, aussi appelée CC BY [<a
@@ -2163,10 +2282,10 @@
 
 </dl>
 
-
-<h3><a id="Fonts">Licences pour les polices de caractères</a> <span
-class="anchor-reference-id">(<a href="#Fonts">#Fonts</a>)</span>
-</h3>
+<!-- end class="orange" -->
+<h4 id="Fonts" class="big-subsection">
+    Licences pour les polices de caractères</h4>
+<span class="anchor-reference-id"> (<a href="#Fonts">#Fonts</a>)</span>
 
 <p>Les licences ci-dessous ne s'appliquent pas à la conception artistique, 
mais
 plutôt la mise en œuvre d'un concept dans un fichier numérique. Autant que
@@ -2174,7 +2293,7 @@
 d'auteur) la mise en œuvre d'un concept. Le statut légal de la conception
 artistique elle-même est complexe et varie selon les juridictions.</p>
 
-<dl>
+<dl class="green">
 
 <dt><a id="GPLFonts" href="/licenses/gpl.html"> GNU General Public License</a>
 <span class="anchor-reference-id"> (<a
@@ -2188,6 +2307,9 @@
 href="http://www.fsf.org/blogs/licensing/20050425novalis";>billet explicatif
 au sujet de l'exception à la GPL pour les polices</a>.</p></dd>
 
+</dl> 
+<!-- end class="green" -->
+<dl  class="orange">
 
 <dt><a id="Arphic"
 href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE";> Arphic
@@ -2213,11 +2335,12 @@
 
 </dl>
 
-<h2><a id="OpinionLicenses">Licences pour les œuvres présentant un point de 
vue
-(par exemple une opinion ou un témoignage</a> <span
-class="anchor-reference-id"> (<a
+<!-- end class="orange" -->
+<h4 id="OpinionLicenses" class="big-subsection">
+    Licences pour les œuvres présentant un point de vue (par exemple une 
opinion
+ou un témoignage)</h4>
+<span class="anchor-reference-id"> (<a
 href="#OpinionLicenses">#OpinionLicenses</a>)</span>
-</h2>
 
 <p>Les ouvrages qui expriment l'opinion de quelqu'un (mémoires, éditoriaux,
 etc.) servent un propos fondamentalement différent des créations à usage
@@ -2233,7 +2356,8 @@
 cependant, il en existe deux que nous recommandons :</p>
 
 
-<dl>
+<dl class="blue">
+
 <dt><a id="GNUVerbatim" href="/licenses/licenses.html#VerbatimCopying"> Licence
 GNU « copie et distribution conformes (verbatim) »</a> <span
 class="anchor-reference-id"> (<a
@@ -2258,12 +2382,13 @@
 
 </dl>
 
+<!-- end class="blue" -->
+<hr class="separator" />
 
-<hr />
-<strong><a href="/licenses/licenses.html">En savoir plus sur les
-licences</a></strong>
 
-<div style="font-size: small;">
+<p class="back"><strong><a href="/licenses/licenses.html">En savoir plus sur 
les
+licences</a></strong></p>
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
 <b>Notes de traduction</b><ol>
@@ -2324,17 +2449,16 @@
 (CC BY-ND 3.0 US)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
-<div class="translators-credits">
+<p></p><div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Traduction : Odile Bénassy.<br />Révision : <a
 href="mailto:trad-gnu&#64;april.org";>trad-gnu&#64;april.org</a></div>
 
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/04/05 08:14:31 $
+$Date: 2014/04/11 19:02:55 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- licenses/license-list.ru.html       5 Apr 2014 05:47:24 -0000       1.56
+++ licenses/license-list.ru.html       11 Apr 2014 19:02:55 -0000      1.57
@@ -10,10 +10,82 @@
 программного обеспечения</title>
 
 <!--#include virtual="/licenses/po/license-list.translist" -->
+<style type="text/css" media="print,screen">
+<!--
+/* These statements are commented out in HTML to
+   make them untranslatable.  */
+/* Definitions for color-coded border */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+   padding-left: 1em;
+   margin-left: 0;
+   margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double  blue; }
+
+/* Disable legend for CSS1-only browsers:
+   they don't support :before and :after */
+#content div#legend { display: none; }
+/* Enable legend for CSS2+ browsers. */
address@hidden print,screen {
+#content div#legend { display: block; }
+}
+#content div#legend {
+   float: right;
+   width: auto; max-width: 100%;
+   font-style: normal;
+   padding: 0 1em 1em 1em;
+   margin: 1.5em 0 1em 1em;
+   background: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#content div#legend dt { padding: 1em 0; margin: 0; }
+#content div#legend dd { margin: 0; }
+
+#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center; 
font-weight: bold; }
+#legend dl.green dt:after, #legend dl.orange dt:after,
+#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+-->
+
+</style>
+
+<!-- These statements are split between different <style>
+ elements,
+     and their contents aren't commented out on purpose:
+     they should be translated, preferably as separate strings.  -->
+<style type="text/css" media="print,screen">
+#legend blockquote:before { content: "Значения линий слева"; 
}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.green dt:after {
+   content: "Свободные лицензии, совместимые с 
GNU GPL или FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.orange dt:after {
+   content: "Свободные лицензии, несовместимые 
с GNU GPL и FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.red dt:after { content: "Несвободные лицензии"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.blue dt:after { content: "Лицензии для работ, 
выражающих мнение"; }
+</style>
+
 <!--#include virtual="/server/banner.ru.html" -->
 <h2>Различные лицензии и комментарии к 
ним</h2>
 
-<h3><a id="TableOfContents">Содержание</a></h3>
+
+<div class="toc">
+
+<h3 id="TableOfContents">Содержание</h3>
 
 <ul>
 <li><a href="#Introduction">Введение</a></li>
@@ -36,16 +108,22 @@
   </ul>
 </li>
 
-<li><a href="#OtherLicenses"> Лицензии для работ 
практического применения, кроме
-программ и документации</a>
-    <ul><li><a href="#Fonts">Лицензии для 
шрифтов</a></li></ul>
-    </li>
-<li><a href="#OpinionLicenses"> Лицензии для работ, 
выражающих точку зрения
+<li><a href="#OtherLicenses">Лицензии для других 
работ</a>
+  <ul>
+  <li><a href="#OtherLicenses"> Лицензии для работ 
практического применения, кроме
+программ и документации</a></li>
+  <li><a href="#Fonts">Лицензии для шрифтов</a></li>
+  <li><a href="#OpinionLicenses"> Лицензии для работ, 
выражающих точку зрения
 (например, мнение или свидетельство)</a></li>
+  </ul>
+</li>
 </ul>
 
+</div>
 
-<h2><a id="Introduction">Введение</a></h2>
+<!-- /class="toc" -->
+<h3  id="Introduction" class="big-section">
+    Введение</h3>
 
 <p>Мы классифицируем лицензии по 
определенным ключевым критериям:</p>
 
@@ -107,19 +185,33 @@
 лицензиях.</p>
 
 
-<h2><a id="SoftwareLicenses">Лицензии программ</a></h2>
+<div id="legend">
+<blockquote></blockquote>
+<dl class="green"><dt></dt><dd></dd></dl>
+<dl class="orange"><dt></dt><dd></dd></dl>
+<dl class="red"><dt></dt><dd></dd></dl>
+<dl class="blue"><dt></dt><dd></dd></dl>
+</div>
+
+<div>
+<h3 id="SoftwareLicenses" class="big-section">
+     Лицензии для программ</h3>
+</div>
+
 
-<h3><a id="FreeLicenses"></a> <a id="GPLCompatibleLicenses">Лицензии 
свободных
-программ, совместимые с GPL</a> <span 
class="anchor-reference-id"> (<a
+<h4 id="GPLCompatibleLicenses" class="big-subsection">
+    <span id="FreeLicenses"></span>Лицензии свободных 
программ, совместимые с
+GPL</h4>
+<span class="anchor-reference-id"> (<a
 href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>Следующие лицензии удовлетворяют 
критериям лицензий <a
 href="/philosophy/free-sw.html">свободных программ</a> и 
совместимы с <a
 href="#GNUGPL">GNU GPL</a>.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><!-- both generic and version-specific anchors -->
 <a id="GNUGPL"></a> <a id="GNUGPLv3" href="/licenses/gpl.html"> 
Стандартная
 общественная лицензия GNU (GNU General Public License, 
GPL) версии 3</a>
@@ -886,20 +978,22 @@
 
 </dl>
 
+<!-- end class "green" -->
+<hr class="separator" />
+
 
-<hr />
-<h3><a id="GPLIncompatibleLicenses"> Несовместимые с GPL 
лицензии свободных
-программ</a> <span class="anchor-reference-id"> (<a
+<h4 id="GPLIncompatibleLicenses" class="big-subsection">
+    Лицензии свободных программ, 
несовместимые с GPL</h4>
+<span class="anchor-reference-id"> (<a
 href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>Следующие лицензии являются 
лицензиями <a
 href="/philosophy/free-sw.html">свободных программ</a>, но 
<a
 href="/licenses/gpl-faq.html#WhatIsCompatible"><em>не 
совместимы</em></a> с
 <a href="#GNUGPL">GNU GPL</a>.</strong></p>
 
+<dl class="orange">
 
-<dl>
 <dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1";>
 Стандартная общественная лицензия Affero 
(Affero General Public License),
 версия&nbsp;1</a> <span class="anchor-reference-id"> (<a
@@ -1485,13 +1579,15 @@
 
 </dl>
 
+<!-- end class="orange -->
+<hr class="separator" />
 
-<hr />    
-<!-- first id is singular, leave for compatibility: -->
-<h3><a id="NonFreeSoftwareLicense"></a> <a id="NonFreeSoftwareLicenses">
-Лицензии несвободных программ</a> <span 
class="anchor-reference-id"> (<a
+<span id="NonFreeSoftwareLicense"></span>
+<h4><a id="NonFreeSoftwareLicenses" class="big-subsection"> Лицензии 
несвободных
+программ</a></h4>
+<span class="anchor-reference-id"> (<a
 href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-</h3>
+
 
 <p><strong>Следующие лицензии <em>не являются</em> 
лицензиями <a
 href="/philosophy/free-sw.html">свободных программ</a>. 
Они автоматически
@@ -1517,7 +1613,8 @@
 причинам это не принесет вреда.</p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="NoLicense">Без лицензии</a> <span 
class="anchor-reference-id"> (<a
 href="#NoLicense">#NoLicense</a>)</span></dt>
 <dd>
@@ -1948,18 +2045,24 @@
 
 </dl>
 
-<h2><a id="DocumentationLicenses">Лицензии для 
документации</a></h2>
+<!-- end class="red" -->
+<div>
+<h3 id="DocumentationLicenses" class="big-section">
+    Лицензии для документации</h3>
+</div>
 
-<h3><a id="FreeDocumentationLicenses">Лицензии свободной 
документации</a> <span
-class="anchor-reference-id"> (<a
+
+<h4 id="FreeDocumentationLicenses" class="big-subsection">
+    Лицензии свободной документации</h4>
+<span class="anchor-reference-id"> (<a
 href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>) </span>
-</h3>
 
 <p><strong>Следующие лицензии удовлетворяют 
критериям лицензий <a
 href="/philosophy/free-doc.html"> свободной 
документации</a>.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="FDL" href="/licenses/fdl.html"> Лицензия свободной 
документации GNU
 (GNU Free Documentation License)</a> <span class="anchor-reference-id">(<a
 href="#FDL">#FDL</a>)</span></dt>
@@ -1971,6 +2074,19 @@
 произведениями (&ldquo;книгами&rdquo;).</p></dd>
 
 
+<dt><a id="FreeBSDDL"
+href="http://directory.fsf.org/wiki?title=License:FreeBSD";> Лицензия
+документации FreeBSD</a> <span class="anchor-reference-id"> (<a
+href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
+<dd>
+<p>Это неограничительная лицензия 
свободной документации без авторского 
лева,
+которая несовместима с GNU FDL.</p></dd>
+
+</dl> 
+<!-- end class="green" -->
+<dl class="orange">
+
+
 <dt><a id="ACDL"
 href="http://fedoraproject.org/wiki/Licensing/Common_Documentation_License";>
 Лицензия общей документации Apple (Apple's Common 
Documentation License),
@@ -1984,15 +2100,6 @@
 Лицензии общей документации.</p></dd>
 
 
-<dt><a id="FreeBSDDL"
-href="http://directory.fsf.org/wiki?title=License:FreeBSD";> Лицензия
-документации FreeBSD</a> <span class="anchor-reference-id"> (<a
-href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
-<dd>
-<p>Это неограничительная лицензия 
свободной документации без авторского 
лева,
-которая несовместима с GNU FDL.</p></dd>
-
-
 <dt><!-- old id, leave for compatibility -->
 <a id="RealOPL"></a> <a id="OpenPublicationL"
 href="http://opencontent.org/openpub/";> Лицензия открытой 
публикации (Open
@@ -2034,19 +2141,22 @@
 
 </dl>
 
+<!-- end class="orange" -->
+<hr class="separator" />
+
 
-<hr />
-<h3><a id="NonFreeDocumentationLicenses"> Лицензии 
несвободной документации</a>
+<h4 id="NonFreeDocumentationLicenses" class="big-subsection">
+    Лицензии несвободной документации</h4>
 <span class="anchor-reference-id"> (<a
 href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
 </span>
-</h3>
 
 <p><strong>Следующие лицензии <em>не 
удовлетворяют критериям</em> лицензий
 свободной документации:</strong></p>
 
 
-<dl>
+<dl class="red">
+
 <dt><!-- brief id, leave for compatibility -->
 <a id="OCL"></a> <a id="OpenContentL"
 href="http://opencontent.org/opl.shtml";> Лицензия открытого 
содержимого
@@ -2066,14 +2176,17 @@
 
 </dl>
 
-<h2><a id="OtherLicenses"> Лицензии для работ 
практического применения, которые
-не являются ни программами, ни 
документацией</a> <span
-class="anchor-reference-id"> (<a
+<!-- end class="red" -->
+<div>
+<h3 id="OtherLicenses" class="big-section">Лицензии для других
 работ</h3>
+</div>
+
+<h4 class="big-subsection">Лицензии для работ 
практического применения, кроме программ и 
документации</h4>
+<span class="anchor-reference-id"> (<a
 href="#OtherLicenses">#OtherLicenses</a>)</span>
-</h2>
 
+<dl class="green">
 
-<dl>
 <dt><a id="GPLOther" href="/licenses/gpl.html"> Стандартная 
общественная
 лицензия GNU</a> <span class="anchor-reference-id"> (<a
 href="#GPLOther">#GPLOther</a>)</span></dt>
@@ -2096,6 +2209,10 @@
 рекомендуем GNU FDL для словарей, 
энциклопедий и любых других произведений,
 которые снабжают сведениями для 
практического пользования.</p></dd>
 
+</dl> 
+<!-- end class="green" -->
+<dl  class="orange">
+
 
 <dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
 Лицензия Creative Commons Attribution 2.0</a> (она же&nbsp;&mdash;
@@ -2173,17 +2290,17 @@
 
 </dl>
 
-
-<h3><a id="Fonts">Лицензии для шрифтов</a> <span 
class="anchor-reference-id">(<a
-href="#Fonts">#Fonts</a>)</span>
-</h3>
+<!-- end class="orange" -->
+<h4 id="Fonts" class="big-subsection">
+    Лицензии для шрифтов</h4>
+<span class="anchor-reference-id"> (<a href="#Fonts">#Fonts</a>)</span>
 
 <p>Перечисленные ниже лицензии относятся 
не к художественному решению, а к его
 выражению в виде файла. Насколько нам 
известно, на реализацию решения всегда
 распространяется авторское право. 
Юридический статус художественного 
решения
 сложен и различается от одной юрисдикции к 
другой.</p>
 
-<dl>
+<dl class="green">
 
 <dt><a id="GPLFonts" href="/licenses/gpl.html"> Стандартная 
общественная
 лицензия GNU (GNU General Public License)</a> <span
@@ -2198,6 +2315,9 @@
 
href="http://www.fsf.org/blogs/licensing/20050425novalis";>пояснительный
 очерк об исключении из GPL для 
шрифтов</a>.</p></dd>
 
+</dl> 
+<!-- end class="green" -->
+<dl  class="orange">
 
 <dt><a id="Arphic"
 href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE";>
@@ -2223,10 +2343,12 @@
 
 </dl>
 
-<h2><a id="OpinionLicenses">Лицензии для работ, 
выражающих точку зрения
-(например, мнение или свидетельство)</a> <span 
class="anchor-reference-id">
-(<a href="#OpinionLicenses">#OpinionLicenses</a>)</span>
-</h2>
+<!-- end class="orange" -->
+<h4 id="OpinionLicenses" class="big-subsection">
+    Лицензии для работ, выражающих точку 
зрения (например, мнение или
+свидетельство)</h4>
+<span class="anchor-reference-id"> (<a
+href="#OpinionLicenses">#OpinionLicenses</a>)</span>
 
 <p>Работы, которые выражают чье-то 
мнение&nbsp;&mdash; мемуары, комментарии и
 так далее&nbsp;&mdash; имеют принципиально 
другое назначение, чем такие
@@ -2244,7 +2366,8 @@
 которые мы рекомендуем:</p>
 
 
-<dl>
+<dl class="blue">
+
 <dt><a id="GNUVerbatim" href="/licenses/licenses.html#VerbatimCopying"> 
Лицензия
 буквального копирования GNU</a> <span 
class="anchor-reference-id"> (<a
 href="#GNUVerbatim">#GNUVerbatim</a>)</span></dt>
@@ -2268,12 +2391,12 @@
 
 </dl>
 
+<!-- end class="blue" -->
+<hr class="separator" />
 
-<hr />
-<strong><a href="/licenses/licenses.html">Подробнее о
-лицензиях.</a></strong>
 
-<div style="font-size: small;">
+<p class="back"><strong><a href="/licenses/licenses.html">Подробнее 
о лицензиях</a></strong></p>
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
@@ -2322,7 +2445,7 @@
 производных произведений</em>) 3.0 США</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
-<div class="translators-credits">
+<p></p><div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <em>Внимание! В подготовке этого перевода 
участвовал только один человек. Вы
@@ -2331,11 +2454,10 @@
 href="http://savannah.gnu.org/projects/www-ru";>русской группе 
переводов
 gnu.org</a>.</em></div>
 
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/04/05 05:47:24 $
+$Date: 2014/04/11 19:02:55 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.fr-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr-en.html,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- licenses/po/license-list.fr-en.html 5 Apr 2014 08:14:35 -0000       1.62
+++ licenses/po/license-list.fr-en.html 11 Apr 2014 19:02:56 -0000      1.63
@@ -3,10 +3,80 @@
 <title>Various Licenses and Comments about Them
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/license-list.translist" -->
+
+<style type="text/css" media="print,screen">
+<!--
+/* These statements are commented out in HTML to
+   make them untranslatable.  */
+/* Definitions for color-coded border */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+   padding-left: 1em;
+   margin-left: 0;
+   margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double  blue; }
+
+/* Disable legend for CSS1-only browsers:
+   they don't support :before and :after */
+#content div#legend { display: none; }
+/* Enable legend for CSS2+ browsers. */
address@hidden print,screen {
+#content div#legend { display: block; }
+}
+#content div#legend {
+   float: right;
+   width: auto; max-width: 100%;
+   font-style: normal;
+   padding: 0 1em 1em 1em;
+   margin: 1.5em 0 1em 1em;
+   background: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#content div#legend dt { padding: 1em 0; margin: 0; }
+#content div#legend dd { margin: 0; }
+
+#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center; 
font-weight: bold; }
+#legend dl.green dt:after, #legend dl.orange dt:after,
+#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+-->
+</style>
+<!-- These statements are split between different <style> elements,
+     and their contents aren't commented out on purpose:
+     they should be translated, preferably as separate strings.  -->
+<style type="text/css" media="print,screen">
+#legend blockquote:before { content: "Code for the left border"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.green dt:after {
+   content: "Free licenses, compatible with the GNU GPL or FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.orange dt:after {
+   content: "Free licenses, incompatible with the GNU GPL and FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.red dt:after { content: "Nonfree licenses"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
+</style>
+
 <!--#include virtual="/server/banner.html" -->
 <h2>Various Licenses and Comments about Them</h2>
 
-<h3><a id="TableOfContents">Table of Contents</a></h3>
+
+<div class="toc">
+
+<h3 id="TableOfContents">Table of Contents</h3>
 
 <ul>
 <li><a href="#Introduction">Introduction</a></li>
@@ -29,16 +99,22 @@
   </ul>
 </li>
 
-<li><a href="#OtherLicenses">
-    Licenses for Works of Practical Use Besides Software and Documentation</a>
-    <ul><li><a href="#Fonts">Licenses for Fonts</a></li></ul>
-    </li>
-<li><a href="#OpinionLicenses">
-    Licenses for Works stating a Viewpoint (e.g., Opinion or 
Testimony)</a></li>
+<li><a href="#OtherLicenses">Licenses for Other Works</a>
+  <ul>
+  <li><a href="#OtherLicenses">Licenses for Works of Practical Use
+      besides Software and Documentation</a></li>
+  <li><a href="#Fonts">Licenses for Fonts</a></li>
+  <li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
+      (e.g., Opinion or Testimony)</a></li>
+  </ul>
+</li>
 </ul>
 
+</div> <!-- /class="toc" -->
 
-<h2><a id="Introduction">Introduction</a></h2>
+
+<h3  id="Introduction" class="big-section">
+    Introduction</h3>
 
 <p>We classify a license according to certain key criteria:</p>
 
@@ -98,14 +174,25 @@
 their licensing information.</p>
 
 
-<h2><a id="SoftwareLicenses">Software Licenses</a></h2>
+<div id="legend">
+<blockquote></blockquote>
+<dl class="green"><dt></dt><dd></dd></dl>
+<dl class="orange"><dt></dt><dd></dd></dl>
+<dl class="red"><dt></dt><dd></dd></dl>
+<dl class="blue"><dt></dt><dd></dd></dl>
+</div>
 
-<h3><a id="FreeLicenses"></a>
-    <a id="GPLCompatibleLicenses">
-    GPL-Compatible Free Software Licenses</a>
-    <span class="anchor-reference-id">
+<div>
+<h3 id="SoftwareLicenses" class="big-section">
+     Software Licenses</h3>
+</div>
+
+
+<h4 id="GPLCompatibleLicenses" class="big-subsection">
+    <span id="FreeLicenses"></span>
+    GPL-Compatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>The following licenses qualify as <a
 href="/philosophy/free-sw.html">free software</a>
@@ -113,7 +200,8 @@
 GPL</a>.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="GNUGPL"></a>  <!-- both generic and version-specific anchors -->
     <a id="GNUGPLv3" href="/licenses/gpl.html">
     GNU General Public License (GPL) version 3</a>
@@ -904,23 +992,23 @@
 <p>This is a lax, permissive non-copyleft free software license
 which is compatible with the GNU GPL.</p></dd>
 
-</dl>
+</dl> <!-- end class "green" -->
 
+<hr class="separator" />
 
-<hr />
-<h3><a id="GPLIncompatibleLicenses">
-    GPL-Incompatible Free Software Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="GPLIncompatibleLicenses" class="big-subsection">
+    GPL-Incompatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>The following licenses
 are <a href="/philosophy/free-sw.html">free software</a> licenses, but
 are <a href="/licenses/gpl-faq.html#WhatIsCompatible"><em>not
 compatible</em></a> with the <a href="#GNUGPL">GNU GPL</a>.</strong></p>
 
+<dl class="orange">
 
-<dl>
 <dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1";>
     Affero General Public License version 1</a>
     <span class="anchor-reference-id">
@@ -1513,16 +1601,16 @@
 <p><a href="#Zope20">Version 2.0 of the Zope Public License</a> is
 GPL-compatible.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange -->
 
+<hr class="separator" />
 
-<hr />    <!-- first id is singular, leave for compatibility: -->
-<h3><a id="NonFreeSoftwareLicense"></a>
-    <a id="NonFreeSoftwareLicenses">
-    Nonfree Software Licenses</a>
-    <span class="anchor-reference-id">
+<span id="NonFreeSoftwareLicense"></span>
+<h4><a id="NonFreeSoftwareLicenses" class="big-subsection">
+    Nonfree Software Licenses</a></h4>
+<span class="anchor-reference-id">
      (<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-</h3>
+
 
 <p><strong>The following licenses <em>do not qualify</em> as <a
 href="/philosophy/free-sw.html">free software</a>
@@ -1547,7 +1635,8 @@
 unless we think that for specific reasons it won't backfire.</p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="NoLicense">No license</a>
     <span class="anchor-reference-id">
        (<a href="#NoLicense">#NoLicense</a>)</span></dt>
@@ -1969,22 +2058,27 @@
 <p>(The YaST software itself no longer uses this nonfree YaST license;
 happily, it is now free software, released under the GNU GPL.)</p></dd>
 
-</dl>
+</dl> <!-- end class="red" -->
 
-<h2><a id="DocumentationLicenses">Licenses For Documentation</a></h2>
+<div>
+<h3 id="DocumentationLicenses" class="big-section">
+    Licenses For Documentation</h3>
+</div>
 
-<h3><a id="FreeDocumentationLicenses">Free Documentation Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="FreeDocumentationLicenses" class="big-subsection">
+    Free Documentation Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>)
     </span>
-</h3>
 
 <p><strong>The following licenses qualify as <a
 href="/philosophy/free-doc.html">free
 documentation</a> licenses.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="FDL" href="/licenses/fdl.html">
     GNU Free Documentation License</a>
     <span class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
@@ -1996,6 +2090,19 @@
 (&ldquo;books&rdquo;).</p></dd>
 
 
+<dt><a id="FreeBSDDL"
+       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
+    FreeBSD Documentation License</a>
+    <span class="anchor-reference-id">
+       (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
+<dd>
+<p>This is a permissive non-copyleft free documentation license that is
+compatible with the GNU FDL.</p></dd>
+
+</dl> <!-- end class="green" -->
+<dl class="orange">
+
+
 <dt><a id="ACDL"
        
href="http://fedoraproject.org/wiki/Licensing/Common_Documentation_License";>
     Apple's Common Documentation License, Version 1.0</a>
@@ -2008,16 +2115,6 @@
 Documentation License.</p></dd>
 
 
-<dt><a id="FreeBSDDL"
-       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
-    FreeBSD Documentation License</a>
-    <span class="anchor-reference-id">
-       (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
-<dd>
-<p>This is a permissive non-copyleft free documentation license that is
-compatible with the GNU FDL.</p></dd>
-
-
 <dt><a id="RealOPL"></a>  <!-- old id, leave for compatibility -->
     <a id="OpenPublicationL" href="http://opencontent.org/openpub/";>
     Open Publication License, Version 1.0</a>
@@ -2055,22 +2152,23 @@
 abbreviation &ldquo;OPL&rdquo; for either license.  It is worth spelling
 their names in full to make sure people understand what you say.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
+<hr class="separator" />
 
-<hr />
-<h3><a id="NonFreeDocumentationLicenses">
-    Nonfree Documentation Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="NonFreeDocumentationLicenses" class="big-subsection">
+    Nonfree Documentation Licenses</h4>
+<span class="anchor-reference-id">
     (<a href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
     </span>
-</h3>
 
 <p><strong>The following licenses <em>do not qualify</em>
 as free documentation licenses:</strong></p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="OCL"></a> <!-- brief id, leave for compatibility -->
     <a id="OpenContentL" href="http://opencontent.org/opl.shtml";>
     Open Content License, Version 1.0</a>
@@ -2087,16 +2185,19 @@
 spelling their names in full to make sure people understand what you
 say.</p></dd>
 
-</dl>
+</dl> <!-- end class="red" -->
 
-<h2><a id="OtherLicenses">
-    Licenses for Works of Practical Use Besides Software and Documentation</a>
-    <span class="anchor-reference-id">
+<div>
+<h3 id="OtherLicenses" class="big-section">Licenses for Other Works</h3>
+</div>
+
+<h4 class="big-subsection">Licenses for Works of Practical Use
+    besides Software and Documentation</h4>
+<span class="anchor-reference-id">
        (<a href="#OtherLicenses">#OtherLicenses</a>)</span>
-</h2>
 
+<dl class="green">
 
-<dl>
 <dt><a id="GPLOther" href="/licenses/gpl.html">
     GNU General Public License</a>
     <span class="anchor-reference-id">
@@ -2121,6 +2222,9 @@
 recommend the GNU FDL for dictionaries, encyclopedias, and any other
 works that provide information for practical use.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl  class="orange">
+
 
 <dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
     Creative Commons Attribution 2.0 license</a>
@@ -2191,19 +2295,20 @@
 copyrightable, so we don't recommend using it; however, there is no
 reason to avoid using data released this way.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
 
-<h3><a id="Fonts">Licenses for Fonts</a>
-    <span class="anchor-reference-id">(<a href="#Fonts">#Fonts</a>)</span>
-</h3>
+<h4 id="Fonts" class="big-subsection">
+    Licenses for Fonts</h4>
+<span class="anchor-reference-id">
+    (<a href="#Fonts">#Fonts</a>)</span>
 
 <p>The licenses below apply to an instantiation of a design in a computer
 file, not the artistic design.  As far as we know, an implementation of
 a design is always copyrightable.  The legal status of the artistic
 design is complex, and varies by jurisdiction.</p>
 
-<dl>
+<dl class="green">
 
 <dt><a id="GPLFonts" href="/licenses/gpl.html">
     GNU General Public License</a>
@@ -2219,6 +2324,8 @@
 href="http://www.fsf.org/blogs/licensing/20050425novalis";>explanatory
 essay about the GPL Font Exception</a>.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl  class="orange">
 
 <dt><a id="Arphic"
        href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE";>
@@ -2243,12 +2350,13 @@
 harmless.  Neither we nor SIL recommend the use of this license for
 anything other than fonts.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
-<h2><a id="OpinionLicenses"> Licenses for Works stating a Viewpoint (e.g., 
Opinion or Testimony)</a>
-    <span class="anchor-reference-id">
+
+<h4 id="OpinionLicenses" class="big-subsection">
+    Licenses for Works stating a Viewpoint (e.g., Opinion or Testimony)</h4>
+<span class="anchor-reference-id">
        (<a href="#OpinionLicenses">#OpinionLicenses</a>)</span>
-</h2>
 
 <p>Works that express someone's opinion&mdash;memoirs, editorials, and
 so on&mdash;serve a fundamentally different purpose than works for
@@ -2265,7 +2373,8 @@
 two that we recommend:</p>
 
 
-<dl>
+<dl class="blue">
+
 <dt><a id="GNUVerbatim" href="/licenses/licenses.html#VerbatimCopying">
     GNU Verbatim Copying License</a>
     <span class="anchor-reference-id">
@@ -2290,11 +2399,12 @@
 Please <a href="#which-cc">be specific about which Creative
 Commons license is being used</a>.</p></dd>
 
-</dl>
+</dl> <!-- end class="blue" -->
+
+<hr class="separator" />
 
 
-<hr />
-<strong><a href="/licenses/licenses.html">More about licenses.</a></strong>
+<p class="back"><strong><a href="/licenses/licenses.html">More about 
licenses</a></strong></p>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -2334,7 +2444,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/05 08:14:35 $
+$Date: 2014/04/11 19:02:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- licenses/po/license-list.ru-en.html 5 Apr 2014 05:47:28 -0000       1.49
+++ licenses/po/license-list.ru-en.html 11 Apr 2014 19:02:56 -0000      1.50
@@ -3,10 +3,80 @@
 <title>Various Licenses and Comments about Them
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/license-list.translist" -->
+
+<style type="text/css" media="print,screen">
+<!--
+/* These statements are commented out in HTML to
+   make them untranslatable.  */
+/* Definitions for color-coded border */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+   padding-left: 1em;
+   margin-left: 0;
+   margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double  blue; }
+
+/* Disable legend for CSS1-only browsers:
+   they don't support :before and :after */
+#content div#legend { display: none; }
+/* Enable legend for CSS2+ browsers. */
address@hidden print,screen {
+#content div#legend { display: block; }
+}
+#content div#legend {
+   float: right;
+   width: auto; max-width: 100%;
+   font-style: normal;
+   padding: 0 1em 1em 1em;
+   margin: 1.5em 0 1em 1em;
+   background: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#content div#legend dt { padding: 1em 0; margin: 0; }
+#content div#legend dd { margin: 0; }
+
+#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center; 
font-weight: bold; }
+#legend dl.green dt:after, #legend dl.orange dt:after,
+#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+-->
+</style>
+<!-- These statements are split between different <style> elements,
+     and their contents aren't commented out on purpose:
+     they should be translated, preferably as separate strings.  -->
+<style type="text/css" media="print,screen">
+#legend blockquote:before { content: "Code for the left border"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.green dt:after {
+   content: "Free licenses, compatible with the GNU GPL or FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.orange dt:after {
+   content: "Free licenses, incompatible with the GNU GPL and FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.red dt:after { content: "Nonfree licenses"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
+</style>
+
 <!--#include virtual="/server/banner.html" -->
 <h2>Various Licenses and Comments about Them</h2>
 
-<h3><a id="TableOfContents">Table of Contents</a></h3>
+
+<div class="toc">
+
+<h3 id="TableOfContents">Table of Contents</h3>
 
 <ul>
 <li><a href="#Introduction">Introduction</a></li>
@@ -29,16 +99,22 @@
   </ul>
 </li>
 
-<li><a href="#OtherLicenses">
-    Licenses for Works of Practical Use Besides Software and Documentation</a>
-    <ul><li><a href="#Fonts">Licenses for Fonts</a></li></ul>
-    </li>
-<li><a href="#OpinionLicenses">
-    Licenses for Works stating a Viewpoint (e.g., Opinion or 
Testimony)</a></li>
+<li><a href="#OtherLicenses">Licenses for Other Works</a>
+  <ul>
+  <li><a href="#OtherLicenses">Licenses for Works of Practical Use
+      besides Software and Documentation</a></li>
+  <li><a href="#Fonts">Licenses for Fonts</a></li>
+  <li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
+      (e.g., Opinion or Testimony)</a></li>
+  </ul>
+</li>
 </ul>
 
+</div> <!-- /class="toc" -->
 
-<h2><a id="Introduction">Introduction</a></h2>
+
+<h3  id="Introduction" class="big-section">
+    Introduction</h3>
 
 <p>We classify a license according to certain key criteria:</p>
 
@@ -98,14 +174,25 @@
 their licensing information.</p>
 
 
-<h2><a id="SoftwareLicenses">Software Licenses</a></h2>
+<div id="legend">
+<blockquote></blockquote>
+<dl class="green"><dt></dt><dd></dd></dl>
+<dl class="orange"><dt></dt><dd></dd></dl>
+<dl class="red"><dt></dt><dd></dd></dl>
+<dl class="blue"><dt></dt><dd></dd></dl>
+</div>
 
-<h3><a id="FreeLicenses"></a>
-    <a id="GPLCompatibleLicenses">
-    GPL-Compatible Free Software Licenses</a>
-    <span class="anchor-reference-id">
+<div>
+<h3 id="SoftwareLicenses" class="big-section">
+     Software Licenses</h3>
+</div>
+
+
+<h4 id="GPLCompatibleLicenses" class="big-subsection">
+    <span id="FreeLicenses"></span>
+    GPL-Compatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>The following licenses qualify as <a
 href="/philosophy/free-sw.html">free software</a>
@@ -113,7 +200,8 @@
 GPL</a>.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="GNUGPL"></a>  <!-- both generic and version-specific anchors -->
     <a id="GNUGPLv3" href="/licenses/gpl.html">
     GNU General Public License (GPL) version 3</a>
@@ -904,23 +992,23 @@
 <p>This is a lax, permissive non-copyleft free software license
 which is compatible with the GNU GPL.</p></dd>
 
-</dl>
+</dl> <!-- end class "green" -->
 
+<hr class="separator" />
 
-<hr />
-<h3><a id="GPLIncompatibleLicenses">
-    GPL-Incompatible Free Software Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="GPLIncompatibleLicenses" class="big-subsection">
+    GPL-Incompatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>The following licenses
 are <a href="/philosophy/free-sw.html">free software</a> licenses, but
 are <a href="/licenses/gpl-faq.html#WhatIsCompatible"><em>not
 compatible</em></a> with the <a href="#GNUGPL">GNU GPL</a>.</strong></p>
 
+<dl class="orange">
 
-<dl>
 <dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1";>
     Affero General Public License version 1</a>
     <span class="anchor-reference-id">
@@ -1513,16 +1601,16 @@
 <p><a href="#Zope20">Version 2.0 of the Zope Public License</a> is
 GPL-compatible.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange -->
 
+<hr class="separator" />
 
-<hr />    <!-- first id is singular, leave for compatibility: -->
-<h3><a id="NonFreeSoftwareLicense"></a>
-    <a id="NonFreeSoftwareLicenses">
-    Nonfree Software Licenses</a>
-    <span class="anchor-reference-id">
+<span id="NonFreeSoftwareLicense"></span>
+<h4><a id="NonFreeSoftwareLicenses" class="big-subsection">
+    Nonfree Software Licenses</a></h4>
+<span class="anchor-reference-id">
      (<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-</h3>
+
 
 <p><strong>The following licenses <em>do not qualify</em> as <a
 href="/philosophy/free-sw.html">free software</a>
@@ -1547,7 +1635,8 @@
 unless we think that for specific reasons it won't backfire.</p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="NoLicense">No license</a>
     <span class="anchor-reference-id">
        (<a href="#NoLicense">#NoLicense</a>)</span></dt>
@@ -1969,22 +2058,27 @@
 <p>(The YaST software itself no longer uses this nonfree YaST license;
 happily, it is now free software, released under the GNU GPL.)</p></dd>
 
-</dl>
+</dl> <!-- end class="red" -->
 
-<h2><a id="DocumentationLicenses">Licenses For Documentation</a></h2>
+<div>
+<h3 id="DocumentationLicenses" class="big-section">
+    Licenses For Documentation</h3>
+</div>
 
-<h3><a id="FreeDocumentationLicenses">Free Documentation Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="FreeDocumentationLicenses" class="big-subsection">
+    Free Documentation Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>)
     </span>
-</h3>
 
 <p><strong>The following licenses qualify as <a
 href="/philosophy/free-doc.html">free
 documentation</a> licenses.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="FDL" href="/licenses/fdl.html">
     GNU Free Documentation License</a>
     <span class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
@@ -1996,6 +2090,19 @@
 (&ldquo;books&rdquo;).</p></dd>
 
 
+<dt><a id="FreeBSDDL"
+       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
+    FreeBSD Documentation License</a>
+    <span class="anchor-reference-id">
+       (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
+<dd>
+<p>This is a permissive non-copyleft free documentation license that is
+compatible with the GNU FDL.</p></dd>
+
+</dl> <!-- end class="green" -->
+<dl class="orange">
+
+
 <dt><a id="ACDL"
        
href="http://fedoraproject.org/wiki/Licensing/Common_Documentation_License";>
     Apple's Common Documentation License, Version 1.0</a>
@@ -2008,16 +2115,6 @@
 Documentation License.</p></dd>
 
 
-<dt><a id="FreeBSDDL"
-       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
-    FreeBSD Documentation License</a>
-    <span class="anchor-reference-id">
-       (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
-<dd>
-<p>This is a permissive non-copyleft free documentation license that is
-compatible with the GNU FDL.</p></dd>
-
-
 <dt><a id="RealOPL"></a>  <!-- old id, leave for compatibility -->
     <a id="OpenPublicationL" href="http://opencontent.org/openpub/";>
     Open Publication License, Version 1.0</a>
@@ -2055,22 +2152,23 @@
 abbreviation &ldquo;OPL&rdquo; for either license.  It is worth spelling
 their names in full to make sure people understand what you say.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
+<hr class="separator" />
 
-<hr />
-<h3><a id="NonFreeDocumentationLicenses">
-    Nonfree Documentation Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="NonFreeDocumentationLicenses" class="big-subsection">
+    Nonfree Documentation Licenses</h4>
+<span class="anchor-reference-id">
     (<a href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
     </span>
-</h3>
 
 <p><strong>The following licenses <em>do not qualify</em>
 as free documentation licenses:</strong></p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="OCL"></a> <!-- brief id, leave for compatibility -->
     <a id="OpenContentL" href="http://opencontent.org/opl.shtml";>
     Open Content License, Version 1.0</a>
@@ -2087,16 +2185,19 @@
 spelling their names in full to make sure people understand what you
 say.</p></dd>
 
-</dl>
+</dl> <!-- end class="red" -->
 
-<h2><a id="OtherLicenses">
-    Licenses for Works of Practical Use Besides Software and Documentation</a>
-    <span class="anchor-reference-id">
+<div>
+<h3 id="OtherLicenses" class="big-section">Licenses for Other Works</h3>
+</div>
+
+<h4 class="big-subsection">Licenses for Works of Practical Use
+    besides Software and Documentation</h4>
+<span class="anchor-reference-id">
        (<a href="#OtherLicenses">#OtherLicenses</a>)</span>
-</h2>
 
+<dl class="green">
 
-<dl>
 <dt><a id="GPLOther" href="/licenses/gpl.html">
     GNU General Public License</a>
     <span class="anchor-reference-id">
@@ -2121,6 +2222,9 @@
 recommend the GNU FDL for dictionaries, encyclopedias, and any other
 works that provide information for practical use.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl  class="orange">
+
 
 <dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
     Creative Commons Attribution 2.0 license</a>
@@ -2191,19 +2295,20 @@
 copyrightable, so we don't recommend using it; however, there is no
 reason to avoid using data released this way.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
 
-<h3><a id="Fonts">Licenses for Fonts</a>
-    <span class="anchor-reference-id">(<a href="#Fonts">#Fonts</a>)</span>
-</h3>
+<h4 id="Fonts" class="big-subsection">
+    Licenses for Fonts</h4>
+<span class="anchor-reference-id">
+    (<a href="#Fonts">#Fonts</a>)</span>
 
 <p>The licenses below apply to an instantiation of a design in a computer
 file, not the artistic design.  As far as we know, an implementation of
 a design is always copyrightable.  The legal status of the artistic
 design is complex, and varies by jurisdiction.</p>
 
-<dl>
+<dl class="green">
 
 <dt><a id="GPLFonts" href="/licenses/gpl.html">
     GNU General Public License</a>
@@ -2219,6 +2324,8 @@
 href="http://www.fsf.org/blogs/licensing/20050425novalis";>explanatory
 essay about the GPL Font Exception</a>.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl  class="orange">
 
 <dt><a id="Arphic"
        href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE";>
@@ -2243,12 +2350,13 @@
 harmless.  Neither we nor SIL recommend the use of this license for
 anything other than fonts.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
-<h2><a id="OpinionLicenses"> Licenses for Works stating a Viewpoint (e.g., 
Opinion or Testimony)</a>
-    <span class="anchor-reference-id">
+
+<h4 id="OpinionLicenses" class="big-subsection">
+    Licenses for Works stating a Viewpoint (e.g., Opinion or Testimony)</h4>
+<span class="anchor-reference-id">
        (<a href="#OpinionLicenses">#OpinionLicenses</a>)</span>
-</h2>
 
 <p>Works that express someone's opinion&mdash;memoirs, editorials, and
 so on&mdash;serve a fundamentally different purpose than works for
@@ -2265,7 +2373,8 @@
 two that we recommend:</p>
 
 
-<dl>
+<dl class="blue">
+
 <dt><a id="GNUVerbatim" href="/licenses/licenses.html#VerbatimCopying">
     GNU Verbatim Copying License</a>
     <span class="anchor-reference-id">
@@ -2290,11 +2399,12 @@
 Please <a href="#which-cc">be specific about which Creative
 Commons license is being used</a>.</p></dd>
 
-</dl>
+</dl> <!-- end class="blue" -->
+
+<hr class="separator" />
 
 
-<hr />
-<strong><a href="/licenses/licenses.html">More about licenses.</a></strong>
+<p class="back"><strong><a href="/licenses/licenses.html">More about 
licenses</a></strong></p>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -2334,7 +2444,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/05 05:47:28 $
+$Date: 2014/04/11 19:02:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/proprietary-sabotage.ru.html
===================================================================
RCS file: /web/www/www/philosophy/proprietary-sabotage.ru.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/proprietary-sabotage.ru.html     14 Mar 2014 05:41:58 -0000      
1.12
+++ philosophy/proprietary-sabotage.ru.html     11 Apr 2014 19:02:56 -0000      
1.13
@@ -26,6 +26,19 @@
 
 <li>
 <p><a
+href="http://blogs.computerworlduk.com/open-enterprise/2014/04/windows-xp-end-of-an-era-end-of-an-error/index.htm";>
+Microsoft прекращает обновления безопасности 
для Windows XP, за исключением
+некоторых больших пользователей, которые 
оплачивают заоблачные счета</a>.</p>
+
+<p>Я думаю, что человек или компания вправе 
прекратить работу над конкретной
+программой; в данном случае плохо то, что 
Microsoft делает это после того,
+как она сделала пользователей зависимыми 
от Microsoft, так что они не могут
+попросить кого-то другого работать над 
программой для них.
+</p>
+</li>
+
+<li>
+<p><a
 
href="http://www.theguardian.com/world/2013/sep/05/nsa-gchq-encryption-codes-security";>
 NSA располагает лазейками в несвободных 
криптографических программах</a>. Мы
 не знаем, в каких именно, но мы можем быть 
уверены, что среди них есть
@@ -72,8 +85,7 @@
 
 </ul>
 
-
-<div style="font-size: small;">
+<div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
@@ -138,7 +150,7 @@
 производных произведений</em>) 3.0 США</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.ru.html" -->
-<div class="translators-credits">
+<p></p><div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <em>Внимание! В подготовке этого перевода 
участвовал только один человек. Вы
@@ -147,11 +159,10 @@
 href="http://savannah.gnu.org/projects/www-ru";>русской группе 
переводов
 gnu.org</a>.</em></div>
 
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/03/14 05:41:58 $
+$Date: 2014/04/11 19:02:56 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/proprietary-sabotage.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary-sabotage.ru-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/proprietary-sabotage.ru-en.html       14 Mar 2014 05:45:59 
-0000      1.9
+++ philosophy/po/proprietary-sabotage.ru-en.html       11 Apr 2014 19:02:56 
-0000      1.10
@@ -17,6 +17,18 @@
 </li>
 
 <li>
+<p><a 
href="http://blogs.computerworlduk.com/open-enterprise/2014/04/windows-xp-end-of-an-era-end-of-an-error/index.htm";>
+Microsoft cut off security fixes for Windows XP, except to some big
+users that pay exorbitantly.</a></p>
+
+<p>I think a person or company has the right to cease to work on a
+particular program; the wrong here is Microsoft does this after having
+made the users dependent on Microsoft, so they are not free to ask
+someone else to work on the program for them.
+</p>
+</li>
+
+<li>
 <p><a 
href="http://www.theguardian.com/world/2013/sep/05/nsa-gchq-encryption-codes-security";>
 The NSA has put back doors into nonfree encryption software.</a>
 We don't know which ones they are, but we can be sure they include
@@ -117,7 +129,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/03/14 05:45:59 $
+$Date: 2014/04/11 19:02:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/proprietary-sabotage.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary-sabotage.ru.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- philosophy/po/proprietary-sabotage.ru.po    11 Apr 2014 18:12:39 -0000      
1.26
+++ philosophy/po/proprietary-sabotage.ru.po    11 Apr 2014 19:02:56 -0000      
1.27
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-04-11 16:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Sabotage - GNU Project - Free Software Foundation"
@@ -45,25 +44,15 @@
 "NSA об ошибках в Windows до того, как их 
исправят</a>."
 
 #. type: Content of: <ul><li><p>
-# | <a
-# | 
[-href=\"http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm\";>-]
-# | 
{+href=\"http://blogs.computerworlduk.com/open-enterprise/2014/04/windows-xp-end-of-an-era-end-of-an-error/index.htm\";>+}
-# | Microsoft [-informs the NSA of bugs in-] {+cut off security fixes for+}
-# | Windows [-before fixing them.</a>-] {+XP, except to some big users that
-# | pay exorbitantly.</a>+}
-#| msgid ""
-#| "<a href=\"http://blogs.computerworlduk.com/open-enterprise/2013/06/how-";
-#| "can-any-company-ever-trust-microsoft-again/index.htm\"> Microsoft informs "
-#| "the NSA of bugs in Windows before fixing them.</a>"
 msgid ""
 "<a href=\"http://blogs.computerworlduk.com/open-enterprise/2014/04/windows-";
 "xp-end-of-an-era-end-of-an-error/index.htm\"> Microsoft cut off security "
 "fixes for Windows XP, except to some big users that pay exorbitantly.</a>"
 msgstr ""
 "<a href=\"http://blogs.computerworlduk.com/open-enterprise/2014/04/windows-";
-"xp-end-of-an-era-end-of-an-error/index.htm\"> Microsoft прекращает 
обновления "
-"безопасности для Windows XP, за исключением 
некоторых больших пользователей, "
-"которые оплачивают заоблачные счета</a>."
+"xp-end-of-an-era-end-of-an-error/index.htm\"> Microsoft прекращает "
+"обновления безопасности для Windows XP, за 
исключением некоторых больших "
+"пользователей, которые оплачивают 
заоблачные счета</a>."
 
 #. type: Content of: <ul><li><p>
 msgid ""

Index: server/sitemap.ar.html
===================================================================
RCS file: /web/www/www/server/sitemap.ar.html,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/sitemap.ar.html      8 Apr 2014 17:04:11 -0000       1.132
+++ server/sitemap.ar.html      11 Apr 2014 19:02:57 -0000      1.133
@@ -799,11 +799,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1950,7 +1945,7 @@
 <p class="unprintable"><!-- timestamp start -->
 حُدثت:
 
-$Date: 2014/04/08 17:04:11 $
+$Date: 2014/04/11 19:02:57 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.de.html
===================================================================
RCS file: /web/www/www/server/sitemap.de.html,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -b -r1.199 -r1.200
--- server/sitemap.de.html      8 Apr 2014 17:04:12 -0000       1.199
+++ server/sitemap.de.html      11 Apr 2014 19:02:57 -0000      1.200
@@ -808,12 +808,6 @@
     <dd>GNU Post
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/" hreflang="en">GNU
-PRESS-Bildschirmpräsentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1985,7 +1979,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:57 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.es.html
===================================================================
RCS file: /web/www/www/server/sitemap.es.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/sitemap.es.html      8 Apr 2014 17:04:12 -0000       1.29
+++ server/sitemap.es.html      11 Apr 2014 19:02:57 -0000      1.30
@@ -801,11 +801,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1953,7 +1948,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:57 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.fr.html
===================================================================
RCS file: /web/www/www/server/sitemap.fr.html,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -b -r1.205 -r1.206
--- server/sitemap.fr.html      8 Apr 2014 17:04:12 -0000       1.205
+++ server/sitemap.fr.html      11 Apr 2014 19:02:57 -0000      1.206
@@ -804,11 +804,6 @@
     <dd>Timbres GNU
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1984,7 +1979,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:57 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.ja.html
===================================================================
RCS file: /web/www/www/server/sitemap.ja.html,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- server/sitemap.ja.html      8 Apr 2014 17:04:12 -0000       1.171
+++ server/sitemap.ja.html      11 Apr 2014 19:02:57 -0000      1.172
@@ -798,11 +798,6 @@
     <dd>GNU Postの画像
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1915,7 +1910,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:57 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.nl.html
===================================================================
RCS file: /web/www/www/server/sitemap.nl.html,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- server/sitemap.nl.html      8 Apr 2014 17:04:12 -0000       1.121
+++ server/sitemap.nl.html      11 Apr 2014 19:02:57 -0000      1.122
@@ -799,11 +799,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1944,7 +1939,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:57 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.ro.html
===================================================================
RCS file: /web/www/www/server/sitemap.ro.html,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- server/sitemap.ro.html      8 Apr 2014 17:04:12 -0000       1.119
+++ server/sitemap.ro.html      11 Apr 2014 19:02:57 -0000      1.120
@@ -800,11 +800,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1945,7 +1940,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Updated:
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:57 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.ru.html
===================================================================
RCS file: /web/www/www/server/sitemap.ru.html,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- server/sitemap.ru.html      8 Apr 2014 17:04:12 -0000       1.140
+++ server/sitemap.ru.html      11 Apr 2014 19:02:58 -0000      1.141
@@ -804,11 +804,6 @@
     <dd>Почтовый марки и открытки
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1972,7 +1967,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:58 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.sq.html
===================================================================
RCS file: /web/www/www/server/sitemap.sq.html,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/sitemap.sq.html      8 Apr 2014 17:04:12 -0000       1.124
+++ server/sitemap.sq.html      11 Apr 2014 19:02:58 -0000      1.125
@@ -805,11 +805,6 @@
     <dd>Figura për GNU Post
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1968,7 +1963,7 @@
 <p class="unprintable"><!-- timestamp start -->
 U përditësua më:
 
-$Date: 2014/04/08 17:04:12 $
+$Date: 2014/04/11 19:02:58 $
 
 <!-- timestamp end -->
 </p>

Index: server/sitemap.uk.html
===================================================================
RCS file: /web/www/www/server/sitemap.uk.html,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- server/sitemap.uk.html      10 Apr 2014 19:10:28 -0000      1.138
+++ server/sitemap.uk.html      11 Apr 2014 19:02:58 -0000      1.139
@@ -804,11 +804,6 @@
     <dd>Поштові марки та листівки
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1966,7 +1961,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2014/04/10 19:10:28 $
+$Date: 2014/04/11 19:02:58 $
 
 <!-- timestamp end -->
 </p>

Index: server/po/sitemap.es-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.es-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/po/sitemap.es-en.html        8 Apr 2014 17:04:14 -0000       1.6
+++ server/po/sitemap.es-en.html        11 Apr 2014 19:02:58 -0000      1.7
@@ -795,11 +795,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1848,7 +1843,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/08 17:04:14 $
+$Date: 2014/04/11 19:02:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/po/sitemap.fr-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.fr-en.html,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/po/sitemap.fr-en.html        8 Apr 2014 17:04:15 -0000       1.126
+++ server/po/sitemap.fr-en.html        11 Apr 2014 19:02:58 -0000      1.127
@@ -795,11 +795,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1848,7 +1843,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/08 17:04:15 $
+$Date: 2014/04/11 19:02:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/po/sitemap.ru-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.ru-en.html,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/po/sitemap.ru-en.html        8 Apr 2014 17:04:16 -0000       1.86
+++ server/po/sitemap.ru-en.html        11 Apr 2014 19:02:59 -0000      1.87
@@ -795,11 +795,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1848,7 +1843,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/08 17:04:16 $
+$Date: 2014/04/11 19:02:59 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/po/sitemap.uk-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.uk-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/po/sitemap.uk-en.html        10 Apr 2014 19:10:28 -0000      1.20
+++ server/po/sitemap.uk-en.html        11 Apr 2014 19:02:59 -0000      1.21
@@ -795,11 +795,6 @@
     <dd>GNU Post images
 </dd></dl>
 </div>
-
-<div id="directory-graphics-presentation">
-<dl><dt><a href="/graphics/presentation/">graphics/presentation</a></dt>
-    <dd></dd></dl>
-</div>
 </dd></dl>
 </div>
 
@@ -1848,7 +1843,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/10 19:10:28 $
+$Date: 2014/04/11 19:02:59 $
 <!-- timestamp end -->
 </p>
 </div>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]