www/software software.zh-cn.html po/software.zh...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/04/23 07:32:54

Modified files:
        software       : software.zh-cn.html 
        software/po    : software.zh-cn-en.html software.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.zh-cn.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.zh-cn.po?cvsroot=www&r1=1.68&r2=1.69

Patches:
Index: software.zh-cn.html
===================================================================
RCS file: /web/www/www/software/software.zh-cn.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- software.zh-cn.html 27 Aug 2017 13:28:44 -0000      1.19
+++ software.zh-cn.html 23 Apr 2018 11:32:54 -0000      1.20
@@ -90,8 +90,8 @@
 href="#allgnupkgs">所有 GNU 软件包</a> 
的列表。除此之外，还有一个<a
 href="/doc/doc.html">自由软件文档链接</a> 列表。</p>
 
-<p>最后，这里是一个<a href="/software/for-windows.html">Microsoft
-Windows上的自由软件</a>简表，提供给想在 Windows 
下使用自由软件的人们。</p>
+<p>最后，请查看我们的<a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>自由软件替换简表</a>，它们可以用来替换在不同专属系统上运行的专属软件。</p>
 
 <p>我们还发布了一个<a
 
href="/software/free-software-for-education.html">建议采用的教育软件列表</a>。</p>
@@ -277,7 +277,7 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc.</p>
 
 <p>本页面采用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -290,12 +290,13 @@
 <b>翻译</b>：李凡希 2010，2011，2012。<br></br>
 <b>å®¡æ ¡</b>ï¼šé‚“æ¥ ï¼Œ2010。<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2017,
+2018。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2017/08/27 13:28:44 $
+$Date: 2018/04/23 11:32:54 $
 
 <!-- timestamp end -->
 </p>

Index: po/software.zh-cn-en.html
===================================================================
RCS file: /web/www/www/software/po/software.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/software.zh-cn-en.html   27 Aug 2017 13:28:45 -0000      1.1
+++ po/software.zh-cn-en.html   23 Apr 2018 11:32:54 -0000      1.2
@@ -96,9 +96,10 @@
 href="/doc/doc.html">Free software documentation links</a> are listed
 separately.</p>
 
-<p>Finally, we have a <a href="/software/for-windows.html">short list of
-free software for Microsoft Windows</a>, for Windows users who would
-like to try free software.</p>
+<p>Finally, we have <a
+href="https://directory.fsf.org/wiki/Free_Software_Directory:Free_software_replacements";>
+a short list of free software replacements</a> for proprietary software
+running on various proprietary systems.</p>
 
 <p>We have also published a <a 
href="/software/free-software-for-education.html">
 list of recommended educational software</a>.</p>
@@ -352,7 +353,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015, 2016 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015, 2016, 2018 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -362,7 +363,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/08/27 13:28:45 $
+$Date: 2018/04/23 11:32:54 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/software.zh-cn.po
===================================================================
RCS file: /web/www/www/software/po/software.zh-cn.po,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- po/software.zh-cn.po        23 Apr 2018 11:25:37 -0000      1.68
+++ po/software.zh-cn.po        23 Apr 2018 11:32:54 -0000      1.69
@@ -17,7 +17,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-04-22 08:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Software - GNU Project - Free Software Foundation"