www/philosophy words-to-avoid.es.html po/words-...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/05/29 09:57:25

Modified files:
        philosophy     : words-to-avoid.es.html 
        philosophy/po  : words-to-avoid.es-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.es.html?cvsroot=www&r1=1.113&r2=1.114
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es-en.html?cvsroot=www&r1=1.64&r2=1.65

Patches:
Index: words-to-avoid.es.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.es.html,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- words-to-avoid.es.html      16 Apr 2015 18:58:41 -0000      1.113
+++ words-to-avoid.es.html      29 May 2015 09:57:24 -0000      1.114
@@ -341,12 +341,16 @@
 reflexionado lo suficiente.</p>
 <p>
 Los candados no son necesariamente opresivos o malignos. Es probable que
-poseamos varios, con sus correspondientes llaves o las claves. Pueden ser
-útiles o molestos, pero no nos oprimen, pues podemos abrirlos y cerrarlos.</p>
+poseamos varios, con sus correspondientes llaves o claves. Pueden ser útiles
+o molestos, pero no nos oprimen, pues podemos abrirlos y
+cerrarlos. Igualmente pensamos que la <a
+href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>encriptación</a>
+es inestimable para proteger nuestros archivos digitales. Esto también es un
+tipo de candado digital sobre el que nosotros mantenemos el control.</p>
 <p>
 El DRM es como un candado que alguien nos pone, negándose a darnos la llave;
-en otras palabras, es como unas <em>esposas</em>. Por tanto, la expresión
-más clara es «esposas digitales», no  «candados digitales».</p>
+en otras palabras, es como unas <em>esposas</em>. Por tanto, la metáfora más
+apropiada es «esposas digitales», no  «candados digitales».</p>
 <p>
 Varias campañas de oposición han adoptado la expresión desacertada 
«candados
 digitales». Para poner las cosas en su sitio, tenemos que insistir
@@ -940,7 +944,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -958,8 +962,8 @@
 2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc.</p>
 
 <p>Esta página está bajo una <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
-Creative Commons Atribución-SinDerivadas 3.0 Estados Unidos de 
América</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.es_ES";>licencia
+Creative Commons Reconocimiento-SinObraDerivada 4.0 Internacional</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.es.html" -->
 <div class="translators-credits">
@@ -972,7 +976,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2015/04/16 18:58:41 $
+$Date: 2015/05/29 09:57:24 $
 
 <!-- timestamp end -->
 </p>

Index: po/words-to-avoid.es-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es-en.html,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- po/words-to-avoid.es-en.html        29 Mar 2015 08:57:06 -0000      1.64
+++ po/words-to-avoid.es-en.html        29 May 2015 09:57:25 -0000      1.65
@@ -421,12 +421,15 @@
 <p>
 Locks are not necessarily oppressive or bad.  You probably own several
 locks, and their keys or codes as well; you may find them useful or
-troublesome, but they don't oppress you, because you are in a position
-to open and close them.</p>
+troublesome, but they don't oppress you, because you can open and
+close them.  Likewise, we
+find <a 
href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>encryption</a>
+invaluable for protecting our digital files.  That too is a kind
+of digital lock that you have control over.</p>
 <p>
 DRM is like a lock placed on you by someone else, who refuses to give
 you the key&mdash;in other words, like <em>handcuffs</em>.  Therefore,
-the clear way to refer to them is &ldquo;digital handcuffs,&rdquo; not
+the proper metaphor for DRM is &ldquo;digital handcuffs,&rdquo; not
 &ldquo;digital locks.&rdquo;</p>
 <p>
 A number of opposition campaigns have chosen the unwise term
@@ -1003,7 +1006,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -1022,14 +1025,14 @@
 2008, 2009, 2010, 2011, 2012, 2015 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/03/29 08:57:06 $
+$Date: 2015/05/29 09:57:25 $
 <!-- timestamp end -->
 </p>
 </div>