www/server irc-rules.fr.html po/irc-rules.fr-en...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/05/21 14:03:05

Modified files:
        server         : irc-rules.fr.html 
        server/po      : irc-rules.fr-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/irc-rules.fr.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/irc-rules.fr-en.html?cvsroot=www&r1=1.29&r2=1.30

Patches:
Index: irc-rules.fr.html
===================================================================
RCS file: /web/www/www/server/irc-rules.fr.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- irc-rules.fr.html   12 Apr 2014 14:00:34 -0000      1.32
+++ irc-rules.fr.html   21 May 2015 14:03:02 -0000      1.33
@@ -1,11 +1,9 @@
-
+<!--#set var="ENGLISH_PAGE" value="/server/irc-rules.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="/server/irc-rules.en.html" -->
-
 <title>Canaux IRC en rapport avec GNU et la FSF - Projet GNU - Free Software
 Foundation</title>
 
@@ -60,6 +58,8 @@
 <li><a href="irc://irc.gnu.org/gnu-webmasters">#gnu-webmasters</a> – le canal
 des <a href="http://www.gnu.org/people/webmeisters.html";>webmestres de
 GNU</a>, réservé aux discussions à propos de www.gnu.org</li>
+<li><a href="irc://irc.gnu.org/erc">#erc</a> – un canal dédié à ERC, un 
client
+Irc pour Emacs</li>
 </ul>
 
 <h3>Règles des canaux</h3>
@@ -176,7 +176,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
@@ -191,13 +191,13 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2014 Free Software Foundation, Inc.</p>
+2006, 2007, 2008, 2009, 2014, 2015 Free Software Foundation, Inc.</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>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.fr";>Creative
+Commons attribution, pas de modification, 4.0Â international (CCÂ BY-ND
+4.0)</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.fr.html" -->
 <div class="translators-credits">
@@ -209,7 +209,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2014/04/12 14:00:34 $
+$Date: 2015/05/21 14:03:02 $
 
 <!-- timestamp end -->
 </p>

Index: po/irc-rules.fr-en.html
===================================================================
RCS file: /web/www/www/server/po/irc-rules.fr-en.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/irc-rules.fr-en.html     12 Apr 2014 14:00:52 -0000      1.29
+++ po/irc-rules.fr-en.html     21 May 2015 14:03:04 -0000      1.30
@@ -45,7 +45,8 @@
 <a href="http://savannah.gnu.org/";>Savannah.GNU.org</a> hangout channel</li>
 <li><a href="irc://irc.gnu.org/gnu-webmasters">#gnu-webmasters</a> &mdash; The 
 <a href="http://www.gnu.org/people/webmeisters.html";>GNU Webmasters</a>
- channel, for discussions about www.gnu.org</li>
+channel, for discussions about www.gnu.org</li>
+<li><a href="irc://irc.gnu.org/erc">#erc</a> &mdash; IRC channel about ERC, an 
IRC client for Emacs</li>
 </ul>
 
 <h3>Channel rules</h3>
@@ -108,7 +109,7 @@
 
 <h3>Remember</h3>
 
-<p>IRC is there for everyone, not just seasoned GNU Developers.  It is
+<p>IRC is there for everyone, not just seasoned GNU developers.  It is
 unreasonable to expect everyone to ignore a user who is misbehaving,
 and if you have a GNU or FSF cloak, you may be reassigned an
 &ldquo;unaffiliated&rdquo; cloak, in accordance
@@ -147,7 +148,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
@@ -163,17 +164,17 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2014 Free Software Foundation, Inc.</p>
+2005, 2006, 2007, 2008, 2009, 2014, 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: 2014/04/12 14:00:52 $
+$Date: 2015/05/21 14:03:04 $
 <!-- timestamp end -->
 </p>
 </div>