www/distros screenshot.fr.html po/screenshot.fr...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/10/30 13:28:18

Modified files:
        distros        : screenshot.fr.html 
        distros/po     : screenshot.fr-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/screenshot.fr.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.fr-en.html?cvsroot=www&r1=1.21&r2=1.22

Patches:
Index: screenshot.fr.html
===================================================================
RCS file: /web/www/www/distros/screenshot.fr.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- screenshot.fr.html  17 Feb 2015 13:30:51 -0000      1.25
+++ screenshot.fr.html  30 Oct 2015 13:28:17 -0000      1.26
@@ -11,11 +11,13 @@
 <!--#include virtual="/server/banner.fr.html" -->
 <h2>Capture d'écran d'une distribution libre</h2>
 
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Bureau avec fenêtres de 
traitement de texte et de tableur ]" width="100%" /></p>
-
-<p class="c"><small>Capture d'écran du système d'exploitation GNU/Linux avec 
LibreOffice,
-une suite bureautique libre comparable à Microsoft Office ou Apple
-iWork</small></p>
+<p><img src="screenshots/trisquel.png" alt="[ Bureau avec fenêtres de 
traitement de texte, de traitement d'image et de
+navigateur ]"
+  width="100%" /></p>
+
+<p class="c"><small>Capture d'écran du système d'exploitation GNU/Linux avec 
LibreOffice
+(suite bureautique libre), GIMP (logiciel libre de traitement d'image) et
+IceCat (navigateur libre basé sur Firefox).</small></p>
 
 <h3 class="c"><a href="/distros/free-distros.html">Essayer GNU/Linux</a></h3>
 
@@ -63,7 +65,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
@@ -77,13 +79,11 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015 Jade Levesque</p>
 
-<p>Cette page peut être utilisée suivant les conditions de la licence <a
-rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.fr";>Creative
-Commons attribution de paternité, pas de modification, 3.0 États-Unis
-(CCÂ BY-ND 3.0Â US)</a>.
+<p>Cette capture d'écran est sous licence <a rel="license"
+href="https://creativecommons.org/publicdomain/zero/1.0/";>Creative Commons
+CC0Â 1.0 universelle</a>.
 </p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
@@ -96,7 +96,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2015/02/17 13:30:51 $
+$Date: 2015/10/30 13:28:17 $
 
 <!-- timestamp end -->
 </p>

Index: po/screenshot.fr-en.html
===================================================================
RCS file: /web/www/www/distros/po/screenshot.fr-en.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/screenshot.fr-en.html    17 Feb 2015 13:30:52 -0000      1.21
+++ po/screenshot.fr-en.html    30 Oct 2015 13:28:18 -0000      1.22
@@ -6,12 +6,13 @@
 <!--#include virtual="/server/banner.html" -->
 <h2>Screenshot of a Free Distro</h2>
 
-<p><img src="/graphics/t-desktop-4.jpg" alt="[ Desktop with text
- processor and spreadsheet windows ]" width="100%" /></p>
+<p><img src="screenshots/trisquel.png" alt="[ Desktop with text
+  processor, image manipulation program and web browser windows ]"
+  width="100%" /></p>
 
 <p class="c"><small>Screenshot of the Trisquel GNU/Linux distribution
-running LibreOffice, a free software office suite comparable to
-Microsoft Office or Apple iWork</small></p>
+running LibreOffice, a free office suite; GIMP, a free image manipulation
+program; GNU IceCat, a free web browser based on Mozilla Firefox.</small></p>
 
 <h3 class="c"><a href="/distros/free-distros.html">Try GNU/Linux</a></h3>
 
@@ -47,7 +48,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
@@ -62,18 +63,19 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015 Jade Levesque</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>The screenshot is licensed under a
+<a rel="license"
+href="https://creativecommons.org/publicdomain/zero/1.0/";>Creative
+Commons CC0 1.0 Universal License</a>.
 </p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/02/17 13:30:52 $
+$Date: 2015/10/30 13:28:18 $
 <!-- timestamp end -->
 </p>
 </div>