www/philosophy proprietary-sabotage.fr.html po/...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/05/02 14:29:06

Modified files:
        philosophy     : proprietary-sabotage.fr.html 
        philosophy/po  : proprietary-sabotage.fr-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/proprietary-sabotage.fr.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary-sabotage.fr-en.html?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: proprietary-sabotage.fr.html
===================================================================
RCS file: /web/www/www/philosophy/proprietary-sabotage.fr.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- proprietary-sabotage.fr.html        12 Apr 2014 13:57:26 -0000      1.17
+++ proprietary-sabotage.fr.html        2 May 2014 14:29:05 -0000       1.18
@@ -1,11 +1,9 @@
-
+<!--#set var="ENGLISH_PAGE" value="/philosophy/proprietary-sabotage.en.html" 
-->
 
 <!--#include virtual="/server/header.fr.html" -->
 <!-- Parent-Version: 1.77 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
- <!--#set var="ENGLISH_PAGE" value="/philosophy/proprietary-sabotage.en.html" 
-->
-
 <title>Sabotage privateur - Projet GNU - Free Software Foundation</title>
 
 <!--#include virtual="/philosophy/po/proprietary-sabotage.translist" -->
@@ -81,6 +79,11 @@
 
 <p>Nous ne sommes pas d'accord avec ce que dit l'article sur ces questions,
 mais nous le proposons comme référence factuelle.</p>
+
+<p>
+En 2014, <a
+href="http://www.computerworld.com/s/article/9236273/Oracle_will_continue_to_bundle_crapware_with_Java";>Oracle
+a insisté pour continuer cette pratique.</a></p>
 </li>
 
 </ul>
@@ -161,7 +164,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/04/12 13:57:26 $
+$Date: 2014/05/02 14:29:05 $
 
 <!-- timestamp end -->
 </p>

Index: po/proprietary-sabotage.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary-sabotage.fr-en.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/proprietary-sabotage.fr-en.html  12 Apr 2014 13:59:36 -0000      1.14
+++ po/proprietary-sabotage.fr-en.html  2 May 2014 14:29:05 -0000       1.15
@@ -68,6 +68,11 @@
 
 <p>We don't agree with the article's views on those issues, but we
 present it as a factual reference.</p>
+
+<p>
+In
+2014, <a 
href="http://www.computerworld.com/s/article/9236273/Oracle_will_continue_to_bundle_crapware_with_Java";>Oracle
+insisted on continuing this practice.</a></p>
 </li>
 
 </ul>
@@ -129,7 +134,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/12 13:59:36 $
+$Date: 2014/05/02 14:29:05 $
 <!-- timestamp end -->
 </p>
 </div>