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

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/01/01 08:00:08

Modified files:
        .              : home.zh-cn.html 
        po             : home.zh-cn-en.html home.zh-cn.po 

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.240&r2=1.241
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn-en.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.347&r2=1.348

Patches:
Index: home.zh-cn.html
===================================================================
RCS file: /web/www/www/home.zh-cn.html,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -b -r1.240 -r1.241
--- home.zh-cn.html     1 Jan 2020 07:00:08 -0000       1.240
+++ home.zh-cn.html     1 Jan 2020 13:00:07 -0000       1.241
@@ -217,7 +217,7 @@
 <p class="c">
 <a
 
href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf";>
-ShoeTool &mdash; HAPPY HOLIDAYS FROM THE FSF!</a></p>
+ShoeTool &mdash;&mdash; 来自 FSF 的节日祝福！</a></p>
 
 <h2 class="first">GNU是什么？</h2>
 
@@ -268,10 +268,10 @@
 <div class="screenshot">
  <a href="/distros/screenshots/parabola2020-lxde.jpg"><img
    src="/distros/screenshots/parabola2020-lxde-medium.jpg"
-   alt="&nbsp;[Screenshot of Parabola with LXDE desktop]&nbsp;" /></a>
+   alt="&nbsp;[带有 LXDE 桌面的 Parabola 发行版截图]&nbsp;" /></a>
 </div>
-<p><small><a href="https://www.parabola.nu";>Parabola&nbsp;2020</a> with <a
-href="https://lxde.org/";>LXDE desktop</a></small></p>
+<p><small>带有 <a href="https://lxde.org/";>LXDE 桌面</a> 的 <a
+href="https://www.parabola.nu";>Parabola&nbsp;2020</a></small></p>
 <!--#endif
 -->
 <!--#if expr="$DISTRO = pureos" -->
@@ -309,7 +309,7 @@
    alt="&nbsp;[带有 i3 窗口管理器的 Hyperbola&nbsp;0.3 截图]&nbsp;" 
/></a></td>
   <td><a href="/home.html?distro=parabola#gnu-linux"><img
    src="/distros/screenshots/parabola2020-lxde-thumb.jpg"
-   alt="&nbsp;[Screenshot of Parabola&nbsp;2020 with LXDE desktop]&nbsp;" 
/></a></td>
+   alt="&nbsp;[带有 LXDE 桌面的 Parabola&nbsp;2020]&nbsp;" /></a></td>
   <td><a href="/home.html?distro=pureos#gnu-linux"><img
    src="/distros/screenshots/gnome3-thumb.jpg"
    
alt="&nbsp;[带有GNOME&nbsp;3&nbsp;桌面的PureOS&nbsp;8&nbsp;GNU/Linux发行版截图]&nbsp;"
 /></a></td>
@@ -383,10 +383,8 @@
 <div class="second-column">
 
 <div class="emph-box beige">
-<p><strong>The GNU Project strongly urges the community to communicate in ways
-that are friendly, welcoming and kind. See the <a
-href="/philosophy/kind-communication.html"> GNU Kind Communications
-Guidelines</a></strong>.</p>
+<p><strong>GNU 
工程强烈敦促社区以欢迎、友好和善意的方式沟通。请参看 
<a
+href="/philosophy/kind-communication.html">GNU 
友善沟通指南</a></strong>。</p>
 </div>
 
 <div id="Flashes" class="emph-box white">
@@ -549,12 +547,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>翻译</b>：李凡希，2010。<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017-2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017-2020。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2020/01/01 07:00:08 $
+$Date: 2020/01/01 13:00:07 $
 
 <!-- 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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/home.zh-cn-en.html       11 Nov 2019 23:28:29 -0000      1.28
+++ po/home.zh-cn-en.html       1 Jan 2020 13:00:08 -0000       1.29
@@ -1,5 +1,5 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.86 -->
+<!--#include virtual="/server/html5-header.html" -->
+<!-- Parent-Version: 1.90 -->
    <!--#if expr="$QUERY_STRING = /distro=([^&#]+)/"
 --><!--#set var="DISTRO" value="$1"
 --><!--#else --><!--#set var="DISTRO" value="hyperbola"
@@ -182,6 +182,34 @@
 <div id="home">
 <div class="first-column">
 
+<div style="max-width: 40em; margin: 2.3em auto 0">
+<video width="100%" controls="controls" crossorigin="anonymous"
+poster="https://static.fsf.org/nosvn/videos/fsf-shoetool/thumbnails/ShoeTool-Cover-1.jpg";>
+
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.webm";
+type="video/webm" />
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.ogv";
+type="video/ogg" />
+<source
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/fsf-shoetool-720p.mp4";
+type="video/mp4" />
+
+<track kind="subtitles" label="English" srclang="en"
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_en.vtt";
+default="default" />
+<track kind="subtitles" label="Nederlands" srclang="nl"
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_nl.vtt";
 />
+<track kind="subtitles" label="Romanian" srclang="ro"
+src="https://static.fsf.org/nosvn/videos/fsf-shoetool/captions/shoetoolfsf_ro.vtt";
 />
+</video>
+</div>
+
+<p class="c">
+<a 
href="https://www.fsf.org/blogs/community/presenting-shoetool-happy-holidays-from-the-fsf";>
+ShoeTool &mdash; HAPPY HOLIDAYS FROM THE FSF!</a></p>
+
 <h2 class="first">What is GNU?</h2>
 
 <p>GNU is an operating system that
@@ -229,6 +257,14 @@
 Hyperbola&nbsp;0.3</a> with <a href="https://i3wm.org/";>i3 window manager</a>,
 cool-retro-term (terminal emulator), Gimp (image editor), and Iceweasel-UXP 
(web
 browser)</small></p><!--#endif
+--><!--#if expr="$DISTRO = parabola" -->
+<div class="screenshot">
+ <a href="/distros/screenshots/parabola2020-lxde.jpg"><img
+   src="/distros/screenshots/parabola2020-lxde-medium.jpg"
+   alt="&nbsp;[Screenshot of Parabola with LXDE desktop]&nbsp;" /></a>
+</div>
+<p><small><a href="https://www.parabola.nu";>Parabola&nbsp;2020</a> with <a
+href="https://lxde.org/";>LXDE desktop</a></small></p><!--#endif
 --><!--#if expr="$DISTRO = pureos" -->
 <div class="screenshot">
  <a href="/distros/screenshots/pureos8-gnome3.jpg"><img
@@ -260,6 +296,9 @@
   <td><a href="/home.html?distro=hyperbola#gnu-linux"><img
    src="/distros/screenshots/hyperbola-i3-thumb.jpg"
    alt="&nbsp;[Screenshot of Hyperbola&nbsp;0.3 with i3 window manager]&nbsp;" 
/></a></td>
+  <td><a href="/home.html?distro=parabola#gnu-linux"><img
+   src="/distros/screenshots/parabola2020-lxde-thumb.jpg"
+   alt="&nbsp;[Screenshot of Parabola&nbsp;2020 with LXDE desktop]&nbsp;" 
/></a></td>
   <td><a href="/home.html?distro=pureos#gnu-linux"><img
    src="/distros/screenshots/gnome3-thumb.jpg"
    alt="&nbsp;[Screenshot of PureOS&nbsp;8 with GNOME&nbsp;3 desktop]&nbsp;" 
/></a></td>
@@ -271,6 +310,7 @@
   <td><small>Dragora / IceWM</small></td>
   <td><small>Guix / GNOME3</small></td>
   <td><small>Hyperbola / i3</small></td>
+  <td><small>Parabola / LXDE</small></td>
   <td><small>PureOS / GNOME3</small></td>
   <td><small>Trisquel / MATE</small></td>
  </tr>
@@ -361,7 +401,7 @@
 <div class="second-column">
 
 <div class="emph-box beige">
-<p><strong>The GNU Project encourages the community to communicate in 
+<p><strong>The GNU Project strongly urges the community to communicate in 
 ways that are friendly, welcoming and kind. See the 
 <a href="/philosophy/kind-communication.html">
 GNU Kind Communications Guidelines</a></strong>.</p>
@@ -514,7 +554,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-2019 <a
+<p>Copyright &copy; 1996-2020 <a
 href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -525,7 +565,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/11/11 23:28:29 $
+$Date: 2020/01/01 13:00:08 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -b -r1.347 -r1.348
--- po/home.zh-cn.po    1 Jan 2020 12:38:19 -0000       1.347
+++ po/home.zh-cn.po    1 Jan 2020 13:00:08 -0000       1.348
@@ -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: 2019-12-17 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid "The GNU Operating System and the Free Software Movement"
@@ -146,9 +145,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>"
 
 #. type: Content of: <div><div><div><div><a>
 msgid "<a href=\"/distros/screenshots/parabola2020-lxde.jpg\">"
@@ -173,8 +172,8 @@
 #. type: Attribute 'alt' of: <div><div><table><tr><td><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><p>
 msgid ""
@@ -721,8 +720,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\">"