www/fun humor.zh-cn.html po/humor.zh-cn-en.html...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/10/07 07:58:18

Modified files:
        fun            : humor.zh-cn.html 
        fun/po         : humor.zh-cn-en.html humor.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/humor.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/po/humor.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: humor.zh-cn.html
===================================================================
RCS file: /web/www/www/fun/humor.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- humor.zh-cn.html    23 May 2018 22:57:52 -0000      1.6
+++ humor.zh-cn.html    7 Oct 2018 11:58:18 -0000       1.7
@@ -152,7 +152,6 @@
   <li><a href="/fun/jokes/lawyers.html">律师</a>的笑话</li>
   <li><a href="/fun/jokes/look-and-feel.html">外观和感受</a></li>
   <li><a href="/fun/jokes/panama.html">Panama</a></li>
-  <li><a href="/fun/jokes/linus-islam.html">Linus Torvalds皈依伊斯å…
°</a></li>
   <li><a href="/fun/jokes/quayle.html">Quayle</a></li>
   <li><a href="/fun/jokes/quotations.html">引用</a></li>
   <li><a href="/fun/jokes/smileys.html">笑脸:-)</a></li>
@@ -243,7 +242,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 2015, 2018 Richard M. Stallman</p>
 
 <p>本页面使用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -260,7 +259,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2018/05/23 22:57:52 $
+$Date: 2018/10/07 11:58:18 $
 
 <!-- timestamp end -->
 </p>

Index: po/humor.zh-cn-en.html
===================================================================
RCS file: /web/www/www/fun/po/humor.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/humor.zh-cn-en.html      23 May 2018 13:29:13 -0000      1.1
+++ po/humor.zh-cn-en.html      7 Oct 2018 11:58:18 -0000       1.2
@@ -177,8 +177,6 @@
   <li><a href="/fun/jokes/lawyers.html">Lawyer</a> jokes</li>
   <li><a href="/fun/jokes/look-and-feel.html">Look and Feel</a></li>
   <li><a href="/fun/jokes/panama.html">Panama</a></li>
-  <li><a href="/fun/jokes/linus-islam.html">Linus Torvalds converts to
-  Islam</a></li>
   <li><a href="/fun/jokes/quayle.html">Quayle</a></li>
   <li><a href="/fun/jokes/quotations.html">Quotations</a></li>
   <li><a href="/fun/jokes/smileys.html">Smileys :-)</a></li>
@@ -273,7 +271,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 2015, 2018 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -283,7 +281,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/05/23 13:29:13 $
+$Date: 2018/10/07 11:58:18 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/humor.zh-cn.po
===================================================================
RCS file: /web/www/www/fun/po/humor.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/humor.zh-cn.po   7 Oct 2018 11:46:49 -0000       1.4
+++ po/humor.zh-cn.po   7 Oct 2018 11:58:18 -0000       1.5
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-10-06 20:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Laugh along with GNU - GNU Project - Free Software Foundation"