www-commits
[Top][All Lists]
Advanced

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

www licenses/license-list.es.html licenses/po/l...


From: GNUN
Subject: www licenses/license-list.es.html licenses/po/l...
Date: Sat, 25 Jun 2016 11:58:50 +0000 (UTC)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/06/25 11:58:49

Modified files:
        licenses       : license-list.es.html 
        licenses/po    : license-list.es-en.html license-list.es.po 
        proprietary    : malware-microsoft.es.html 
        proprietary/po : malware-microsoft.es-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.es.html?cvsroot=www&r1=1.106&r2=1.107
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es-en.html?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.es.po?cvsroot=www&r1=1.200&r2=1.201
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-microsoft.es.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.es-en.html?cvsroot=www&r1=1.20&r2=1.21

Patches:
Index: licenses/license-list.es.html
===================================================================
RCS file: /web/www/www/licenses/license-list.es.html,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- licenses/license-list.es.html       12 Apr 2016 08:29:24 -0000      1.106
+++ licenses/license-list.es.html       25 Jun 2016 11:58:48 -0000      1.107
@@ -1406,11 +1406,12 @@
 license</cite></a> <span class="anchor-reference-id"> (<a
 href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
-<p>La licencia de <cite>OpenSSL</cite> es una mezcla de dos licencias, una de
-ellas es la licencia de <cite>SSLeay</cite>. Se debe cumplir con ambas. La
-combinación da como resultado una licencia de software libre con copyleft,
-incompatible con la GPL de GNU. También posee una cláusula de publicidad,
-como en la <a href="#OriginalBSD">licencia BSD original</a> y como en la <a
+<p>La licencia de <cite>OpenSSL</cite> es una mezcla de dos licencias, una es
+la llamada «Licencia OpenSSL» y la otra es la licencia de
+<cite>SSLeay</cite>. Se debe cumplir con ambas. La combinación da como
+resultado una licencia de software libre con copyleft, incompatible con la
+GPL de GNU. También posee una cláusula de publicidad, como en la <a
+href="#OriginalBSD">licencia BSD original</a> y como en la <a
 href="#apache1">licencia Apache&nbsp;1</a>.</p>
 
 <p>Recomendamos utilizar <cite>GNUTLS</cite> en lugar de <cite>OpenSSL</cite>
@@ -2629,7 +2630,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2016/04/12 08:29:24 $
+$Date: 2016/06/25 11:58:48 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.es-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es-en.html,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- licenses/po/license-list.es-en.html 12 Apr 2016 08:29:25 -0000      1.81
+++ licenses/po/license-list.es-en.html 25 Jun 2016 11:58:48 -0000      1.82
@@ -1442,12 +1442,12 @@
     <span class="anchor-reference-id">
        (<a href="#OpenSSL">#OpenSSL</a>)</span></dt>
 <dd>
-<p>The license of OpenSSL is a conjunction of two licenses, one of them
-being the license of SSLeay.  You must follow both.  The combination
-results in a copyleft free software license that is incompatible with
-the GNU GPL.  It also has an advertising clause like the <a
-href="#OriginalBSD">original BSD license</a> and the <a
-href="#apache1">Apache&nbsp;1 license</a>.</p>
+<p>The license of OpenSSL is a conjunction of two licenses, one called
+&ldquo;OpenSSL License&rdquo; and the other being the license of SSLeay. You 
must
+follow both.  The combination results in a copyleft free software
+license that is incompatible with the GNU GPL.  It also has an
+advertising clause like the <a href="#OriginalBSD">original BSD
+license</a> and the <a href="#apache1">Apache&nbsp;1 license</a>.</p>
 
 <p>We recommend using GNUTLS instead of OpenSSL in software you write.
 However, there is no reason not to use OpenSSL and applications that
@@ -2649,7 +2649,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/04/12 08:29:25 $
+$Date: 2016/06/25 11:58:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.es.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.es.po,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- licenses/po/license-list.es.po      25 Jun 2016 11:42:52 -0000      1.200
+++ licenses/po/license-list.es.po      25 Jun 2016 11:58:49 -0000      1.201
@@ -688,8 +688,8 @@
 "\"#boost\">#boost</a>)</span>"
 msgstr ""
 "<a id=\"boost\" href=\"http://directory.fsf.org/wiki/License:Boost1.0\";> "
-"<cite>Boost Software License</cite></a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#boost\">#boost</a>)</span>"
+"<cite>Boost Software License</cite></a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#boost\">#boost</a>)</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1145,11 +1145,11 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#informal\">#informal</a>)</span>"
+"<a id=\"informal\"> Informal license</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#informal\">#informal</a>)</span>"
 msgstr ""
-"<a id=\"informal\">Licencia informal</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#informal\">#informal</a>)</span>"
+"<a id=\"informal\">Licencia informal</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#informal\">#informal</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1562,12 +1562,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> License "
-"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</"
-"a>)</span>"
+"of Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
 msgstr ""
 "<a id=\"Ruby\" href=\"http://directory.fsf.org/wiki/License:Ruby\";> Licencia "
-"de Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</"
-"a>)</span>"
+"de Ruby</a> <span class=\"anchor-reference-id\">(<a href=\"#Ruby\">#Ruby</a>)"
+"</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -1807,8 +1807,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"WebM\" href=\"http://directory.fsf.org/wiki/License:WebM\";> License "
-"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</"
-"a>)</span>"
+"of WebM</a> <span class=\"anchor-reference-id\">(<a href=\"#WebM\">#WebM</a>)"
+"</span>"
 msgstr ""
 "<a id=\"WebM\" href=\"http://directory.fsf.org/wiki/License:WebM\";> "
 "<cite>License of WebM</cite></a> <span class=\"anchor-reference-id\">(<a "
@@ -1990,12 +1990,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> License "
-"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</"
-"a>)</span>"
+"of ZLib</a> <span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
+"</span>"
 msgstr ""
 "<a id=\"ZLib\" href=\"http://directory.fsf.org/wiki/License:Zlib\";> Licencia "
-"de ZLib</a><span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</"
-"a>)</span>"
+"de ZLib</a><span class=\"anchor-reference-id\">(<a href=\"#ZLib\">#ZLib</a>)"
+"</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -2405,8 +2405,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:EPLv1.0\";> "
-"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#EPL\">#EPL</a>)</span>"
+"Eclipse Public License Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#EPL\">#EPL</a>)</span>"
 msgstr ""
 "<a id=\"EPL\" href=\"http://directory.fsf.org/wiki/License:";
 "EPLv1.0\"><cite>Eclipse Public License</cite>, versión  1.0</a> <span class="
@@ -2697,8 +2697,8 @@
 msgid ""
 "<a id=\"lucent102\" href=\"http://directory.fsf.org/wiki/License:";
 "LucentPLv1.02\"> Lucent Public License Version 1.02 (Plan 9 license)</a> "
-"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</"
-"a>)</span>"
+"<span class=\"anchor-reference-id\"> (<a href=\"#lucent102\">#lucent102</a>)"
+"</span>"
 msgstr ""
 "<a id=\"lucent102\" href=\"http://directory.fsf.org/wiki/License:";
 "LucentPLv1.02\"><cite>Lucent Public License</cite>, versión 1.02 (<cite>Plan 
"
@@ -2744,8 +2744,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ms-rl\" href=\"http://directory.fsf.org/wiki/License:MsRL\";> "
-"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
+"Microsoft Reciprocal License (Ms-RL)</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ms-rl\">#ms-rl</a>)</span>"
 msgstr ""
 "<a id=\"ms-rl\" href=\"http://directory.fsf.org/wiki/License:MsRL";
 "\"><cite>Microsoft Reciprocal License (Ms-RL)</cite></a> <span class="
@@ -3101,8 +3101,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"QPL\" href=\"http://directory.fsf.org/wiki/License:QPLv1.0\";> Q "
-"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#QPL\">#QPL</a>)</span>"
+"Public License (QPL), Version 1.0</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#QPL\">#QPL</a>)</span>"
 msgstr ""
 "<a id=\"QPL\" href=\"http://directory.fsf.org/wiki/License:QPLv1.0\";><cite>Q "
 "Public License (QPL)</cite>, versión 1.0</a> <span class=\"anchor-reference-"
@@ -3884,8 +3884,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";> The JSON "
-"License</a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</"
-"a>)</span>"
+"License</a> <span class=\"anchor-reference-id\">(<a href=\"#JSON\">#JSON</a>)"
+"</span>"
 msgstr ""
 "<a id=\"JSON\" href=\"http://directory.fsf.org/wiki/License:JSON\";><cite>The "
 "JSON License</cite></a> <span class=\"anchor-reference-id\">(<a href=\"#JSON"
@@ -3911,8 +3911,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"ksh93\">Old license of ksh93</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ksh93\">#ksh93</a>)</span>"
+"<a id=\"ksh93\">Old license of ksh93</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ksh93\">#ksh93</a>)</span>"
 msgstr ""
 "<a id=\"ksh93\">Antigua licencia de ksh93</a> <span class=\"anchor-reference-"
 "id\">(<a href=\"#ksh93\">#ksh93</a>)</span>"
@@ -3957,8 +3957,8 @@
 msgstr ""
 "<a id=\"Ms-SS\" href= \"http://directory.fsf.org/wiki/License:Ms-SS";
 "\"><cite>Microsoft's Shared Source CLI, C#</cite>, y <cite>Jscript License</"
-"cite></a> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</"
-"a>)</span>"
+"cite></a> <span class=\"anchor-reference-id\">(<a href=\"#Ms-SS\">#Ms-SS</a>)"
+"</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -4133,12 +4133,12 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>License "
-"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</"
-"a>)</span>"
+"of PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 msgstr ""
 "<a id=\"PINE\" href=\"http://directory.fsf.org/wiki/License:PINE\";>Licencia "
-"de PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</"
-"a>)</span>"
+"de PINE</a> <span class=\"anchor-reference-id\">(<a href=\"#PINE\">#PINE</a>)"
+"</span>"
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
@@ -4164,8 +4164,8 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
-"<a id=\"Plan9\">Old Plan 9 license</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#Plan9\">#Plan9</a>)</span>"
+"<a id=\"Plan9\">Old Plan 9 license</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#Plan9\">#Plan9</a>)</span>"
 msgstr ""
 "<a id=\"Plan9\">Antigua licencia de Plan 9</a> <span class=\"anchor-"
 "reference-id\">(<a href=\"#Plan9\">#Plan9</a>)</span>"
@@ -4890,8 +4890,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"CC-BY-ND\" href=\"?\">Creative Commons Noderivatives, any version</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-BY-ND</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-BY-ND</a>)"
+"</span>"
 msgstr ""
 "<a id=\"CC-BY-ND\" href=\"?\">Creative Commons Reconocimiento-"
 "SinObraDerivada, cualquier versión</a> <span class=\"anchor-reference-id\"> "
@@ -4931,8 +4931,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GPLOther\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther\">#GPLOther</a>)"
+"</span>"
 msgstr ""
 "<a id=\"GPLOther\" href=\"/licenses/gpl.html\"> Licencia Pública General de "
 "GNU</a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLOther"
@@ -5223,8 +5223,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"GPLFonts\" href=\"/licenses/gpl.html\"> GNU General Public License</"
-"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</"
-"a>)</span>"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts\">#GPLFonts</a>)"
+"</span>"
 msgstr ""
 "<a id=\"GPLFonts\" href=\"/licenses/gpl.html\"> Licencia Pública General de "
 "GNU</a> <span class=\"anchor-reference-id\"> (<a href=\"#GPLFonts"
@@ -5273,8 +5273,8 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"ecfonts\" href=\"http://directory.fsf.org/wiki/License:LaTeX_ecfonts";
-"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id"
-"\">(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
+"\">License of the ec fonts for LaTeX</a> <span class=\"anchor-reference-id\">"
+"(<a href=\"#ecfonts\">#ecfonts</a>)</span>"
 msgstr ""
 "<a id=\"ecfonts\" href=\"http://directory.fsf.org/wiki/License:LaTeX_ecfonts";
 "\">Licencia de los tipos de letras ec para LaTeX</a> <span class=\"anchor-"

Index: proprietary/malware-microsoft.es.html
===================================================================
RCS file: /web/www/www/proprietary/malware-microsoft.es.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- proprietary/malware-microsoft.es.html       13 Jun 2016 09:32:58 -0000      
1.21
+++ proprietary/malware-microsoft.es.html       25 Jun 2016 11:58:49 -0000      
1.22
@@ -146,6 +146,10 @@
 plataformas.
   </p></li>
 
+  <li><p>La «actualizaciones» de Windows 10 <a
+href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/";>
+borran aplicacones</a> sin pedir permiso.</p></li>
+
   <li><p>
   Microsoft <a
 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1";>
@@ -370,7 +374,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2016/06/13 09:32:58 $
+$Date: 2016/06/25 11:58:49 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/malware-microsoft.es-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.es-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- proprietary/po/malware-microsoft.es-en.html 13 Jun 2016 09:32:59 -0000      
1.20
+++ proprietary/po/malware-microsoft.es-en.html 25 Jun 2016 11:58:49 -0000      
1.21
@@ -120,6 +120,10 @@
   the old version on your future platforms.
   </p></li>
 
+  <li><p>Windows 10 &ldquo;upgrades&rdquo; <a
+      
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/";>
+      delete applications</a> without asking permission.</p></li>
+
   <li><p>
   Microsoft is <a 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1";>
   repeatedly nagging many users to install Windows 10</a>.
@@ -309,7 +313,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/06/13 09:32:59 $
+$Date: 2016/06/25 11:58:49 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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