www home.zh-cn.html po/home.zh-cn-en.html po/ho...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/06/16 03:29:51

Modified files:
        .              : home.zh-cn.html 
        po             : home.zh-cn-en.html home.zh-cn.po 
        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/home.zh-cn.html?cvsroot=www&r1=1.292&r2=1.293
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn-en.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.408&r2=1.409
http://web.cvs.savannah.gnu.org/viewcvs/www/server/irc-rules.fr.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/irc-rules.fr-en.html?cvsroot=www&r1=1.41&r2=1.42

Patches:
Index: home.zh-cn.html
===================================================================
RCS file: /web/www/www/home.zh-cn.html,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- home.zh-cn.html     15 Jun 2021 22:30:05 -0000      1.292
+++ home.zh-cn.html     16 Jun 2021 07:29:49 -0000      1.293
@@ -415,11 +415,10 @@
 <div class="second-column" role="complementary">
 
 <div id="irc" class="emph-box color2">
-<p><strong>GNU and FSF move official IRC channels to Libera.Chat network.  Read
-the full <a
-href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html";>announcement</a></strong>
-and the follow-up <strong><a
-href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html";>update</a></strong>.</p>
+<p><strong>GNU 和 FSF 的官方 IRC 频道已经换到 Libera.Chat 
网络。请参阅 <a
+href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html";>声明</a>
+全文</strong>和后续 <strong><a
+href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html";>更新</a></strong>。</p>
 </div>
 
 <div id="petition" class="emph-box color1">
@@ -599,7 +598,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2021/06/15 22:30:05 $
+$Date: 2021/06/16 07:29:49 $
 
 <!-- timestamp end -->
 </p>

Index: po/home.zh-cn-en.html
===================================================================
RCS file: /web/www/www/po/home.zh-cn-en.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- po/home.zh-cn-en.html       15 Jun 2021 06:59:32 -0000      1.58
+++ po/home.zh-cn-en.html       16 Jun 2021 07:29:51 -0000      1.59
@@ -432,7 +432,9 @@
 <div id="irc" class="emph-box color2">
 <p><strong>GNU and FSF move official IRC channels to Libera.Chat
 network.  Read the full
-<a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html";>announcement</a></strong>.</p>
+<a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html";>announcement</a></strong>
+and the follow-up
+<strong><a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html";>update</a></strong>.</p>
 </div>
 
 <div id="petition" class="emph-box color1">
@@ -607,7 +609,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/06/15 06:59:32 $
+$Date: 2021/06/16 07:29:51 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.408
retrieving revision 1.409
diff -u -b -r1.408 -r1.409
--- po/home.zh-cn.po    16 Jun 2021 07:04:19 -0000      1.408
+++ po/home.zh-cn.po    16 Jun 2021 07:29:51 -0000      1.409
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-06-15 21:55+0000\n"
 
 #. type: Content of: <title>
 msgid "The GNU Operating System and the Free Software Movement"
@@ -179,9 +178,9 @@
 "(terminal emulator), Gimp (image editor), and Iceweasel-UXP (web browser)</"
 "small>"
 msgstr ""
-"<small>带有 <a href=\"https://i3wm.org/\";>i3 
窗口管理器</a>、cool-retro-"
-"term（终端模拟器）、Gimp（图像编辑器）和 
Iceweasel-UXP（网络浏览器）的<a "
-"href=\"https://www.hyperbola.info/\";> Hyperbola&nbsp;0.3</a></small>"
+"<small>带有 <a href=\"https://i3wm.org/\";>i3 
窗口管理器</a>、cool-retro-term"
+"（终端模拟器）、Gimp（图像编辑器）和 
Iceweasel-UXP（网络浏览器）的<a href="
+"\"https://www.hyperbola.info/\";> Hyperbola&nbsp;0.3</a></small>"
 
 #. #endif 
 #. #if expr="$DISTRO = parabola" 
@@ -211,8 +210,8 @@
 #. type: Attribute 'alt' of: <div><div><div><div><div><a><img>
 msgid "&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;"
 msgstr ""
-"&nbsp;[带有GNOME&nbsp;3&nbsp;桌面的PureOS&nbsp;8&nbsp;GNU/Linux发行版截"
-"图]&nbsp;"
+"&nbsp;[带有GNOME&nbsp;3&nbsp;桌面的PureOS&nbsp;8&nbsp;GNU/Linux发行版截图]"
+"&nbsp;"
 
 #. type: Content of: <div><div><div><div><p>
 msgid ""
@@ -823,8 +822,8 @@
 #~ msgid ""
 #~ "&nbsp;[Screenshot of Trisquel&nbsp;7 with Gnome Classic desktop]&nbsp;"
 #~ msgstr ""
-#~ "&nbsp;[带Gnome Classic桌面的Trisquel&nbsp;7&nbsp;GNU/Linux发行版截"
-#~ "图]&nbsp;"
+#~ "&nbsp;[带Gnome 
Classic桌面的Trisquel&nbsp;7&nbsp;GNU/Linux发行版截图]"
+#~ "&nbsp;"
 
 #~ msgid "<a href=\"/distros/screenshot.html\">"
 #~ msgstr "<a href=\"/distros/screenshot.html\">"

Index: server/irc-rules.fr.html
===================================================================
RCS file: /web/www/www/server/irc-rules.fr.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/irc-rules.fr.html    14 Jun 2021 21:59:04 -0000      1.49
+++ server/irc-rules.fr.html    16 Jun 2021 07:29:51 -0000      1.50
@@ -12,6 +12,16 @@
 <h2>Règles et recommandations pour l'utilisation des canaux officiels de GNU 
et
 de la FSF</h2>
 
+<div class="important">
+<p><strong>Les canaux IRC officiels de GNU et de la FSF ont migré vers le
+réseau Libera.Chat.</strong></p>
+<p>Voir <a
+href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html";>l'annonce
+initiale</a> et sa <a
+href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html";>mise
+à jour</a> pour plus de détails.</p>
+</div>
+
 <p>L'<abbr title="Internet Relay Chat">IRC</abbr> (discussion relayée par
 Internet) est un moyen formidable pour connecter les utilisateurs de
 logiciels libres et les développeurs. Nos canaux IRC s'efforcent d'être
@@ -209,7 +219,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2021/06/14 21:59:04 $
+$Date: 2021/06/16 07:29:51 $
 
 <!-- timestamp end -->
 </p>

Index: server/po/irc-rules.fr-en.html
===================================================================
RCS file: /web/www/www/server/po/irc-rules.fr-en.html,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/po/irc-rules.fr-en.html      14 Jun 2021 21:59:04 -0000      1.41
+++ server/po/irc-rules.fr-en.html      16 Jun 2021 07:29:51 -0000      1.42
@@ -8,6 +8,16 @@
 
 <h2>Rules and guidelines for the official GNU and FSF IRC channels</h2>
 
+<div class="important">
+<p><strong>GNU and FSF move official IRC channels to the Libera.Chat
+network effective immediately.</strong></p>
+<p>Please see the
+<a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00005.html";>original
+announcement</a> and the follow-up
+<a 
href="https://lists.gnu.org/archive/html/info-gnu/2021-06/msg00007.html";>update
+announcement</a> for more details.</p>
+</div>
+
 <p>IRC (Internet Relay Chat) provides a wonderful resource to connect
 free software users and developers together.  Our channels try to be
 welcoming to both new people and long-time regulars.  These guidelines
@@ -185,7 +195,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/06/14 21:59:04 $
+$Date: 2021/06/16 07:29:51 $
 <!-- timestamp end -->
 </p>
 </div>