www/proprietary malware-microsoft.es.html propr...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/04/04 08:29:21

Modified files:
        proprietary    : malware-microsoft.es.html 
                         proprietary-censorship.es.html 
        proprietary/po : malware-microsoft.es-en.html 
                         proprietary-censorship.es-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-microsoft.es.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-censorship.es.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.es-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-censorship.es-en.html?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: malware-microsoft.es.html
===================================================================
RCS file: /web/www/www/proprietary/malware-microsoft.es.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- malware-microsoft.es.html   26 Mar 2016 09:29:37 -0000      1.18
+++ malware-microsoft.es.html   4 Apr 2016 08:29:20 -0000       1.19
@@ -172,9 +172,11 @@
 
 <ul>
 
-  <li><p>Microsoft está <a
-href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>engañando
-a los usuarios para sustituir Windows 7 por Windows 10</a>.</p></li>
+  <li><p>Microsoft <a
+href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>está
+engañando a los usuarios</a> <a
+href="http://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity";>para
+sustituir Windows 7 por Windows 10</a>.</p></li>
 
   <li><p>Microsoft ha hecho que los ordenadores con Windows de las empresas <a
 
href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html";>animen
@@ -358,7 +360,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2016/03/26 09:29:37 $
+$Date: 2016/04/04 08:29:20 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary-censorship.es.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-censorship.es.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- proprietary-censorship.es.html      3 Mar 2016 18:59:18 -0000       1.9
+++ proprietary-censorship.es.html      4 Apr 2016 08:29:20 -0000       1.10
@@ -61,7 +61,7 @@
 
 <p>La censura de Google, a diferencia de la de Apple o Microsoft, no es total:
 Android permite a los usuarios instalar aplicaciones de otros modos. Usted
-puede instalar programas libres a través de fdroid.org.</p>
+puede instalar programas libres a través de f-droid.org.</p>
 </li>
 
 <li><p>
@@ -148,7 +148,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Última actualización:
 
-$Date: 2016/03/03 18:59:18 $
+$Date: 2016/04/04 08:29:20 $
 
 <!-- timestamp end -->
 </p>

Index: po/malware-microsoft.es-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.es-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/malware-microsoft.es-en.html     26 Mar 2016 09:29:37 -0000      1.17
+++ po/malware-microsoft.es-en.html     4 Apr 2016 08:29:21 -0000       1.18
@@ -141,8 +141,10 @@
 <ul>
 
   <li><p>Microsoft
-      is <a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>tricking
-        users into replacing Windows 7 with Windows 10</a>.</p></li>
+      <a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>is
+        tricking
+        users</a> <a 
href="http://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity";>into
+        replacing Windows 7 with Windows 10</a>.</p></li>
 
   <li><p>Microsoft has made companies' Windows machines managed by the
 company's
@@ -295,7 +297,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/03/26 09:29:37 $
+$Date: 2016/04/04 08:29:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/proprietary-censorship.es-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-censorship.es-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/proprietary-censorship.es-en.html        3 Mar 2016 18:59:19 -0000       
1.7
+++ po/proprietary-censorship.es-en.html        4 Apr 2016 08:29:21 -0000       
1.8
@@ -53,7 +53,7 @@
 
 <p>Google's censorship, unlike that of Apple and Microsoft, is not total:
 Android allows users to install apps in other ways. You can install
-free programs from fdroid.org.</p>
+free programs from f-droid.org.</p>
 </li>
 
 <li><p>
@@ -123,7 +123,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/03/03 18:59:19 $
+$Date: 2016/04/04 08:29:21 $
 <!-- timestamp end -->
 </p>
 </div>