www/philosophy push-copyright-aside.zh-cn.html ...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/06/30 11:26:10

Modified files:
        philosophy     : push-copyright-aside.zh-cn.html 
                         lessig-fsfs-intro.zh-cn.html 

Log message:
        Patch 2 Chinese translations with translist at the end.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/push-copyright-aside.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/lessig-fsfs-intro.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: push-copyright-aside.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/philosophy/push-copyright-aside.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- push-copyright-aside.zh-cn.html     14 May 2012 16:35:51 -0000      1.4
+++ push-copyright-aside.zh-cn.html     30 Jun 2014 11:26:05 -0000      1.5
@@ -1,9 +1,22 @@
-<!--#include virtual="/server/header.zh-cn.html" -->
+<!--#set var="PO_FILE" value=""
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/push-copyright-aside.html"
+ --><!--#set var="DIFF_FILE" value=""
+ --><!--#set var="OUTDATED_SINCE" value="" -->
 
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>科学必须摒弃版权 - GNU 项目 - 
自由软件基金会（FSF）</title>
 
-<!--#include virtual="/server/banner.zh-cn.html" -->
+<!-- Fixed by hand on June 8, 2014:
+     - add out-of-date notice and disable top-addendum,
+     - remove #translations,
+     - translist before banner,
+     - partially update footer.
+-->
 
+<!--#include virtual="/philosophy/po/push-copyright-aside.translist" -->
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/server/outdated.zh-cn.html" -->
 <h2>科学必须摒弃版权</h2>
 
 <p><strong>理查德・M・斯多尔曼</strong></p>
@@ -38,11 +51,12 @@
 <!--#include virtual="/server/footer.zh-cn.html" -->
 
 <div id="footer">
+<div class="unprintable">
+
 <p>
 问询 FSF 和 GNU 相关事宜请寄邮件至
 <a href="mailto:address@hidden";><em>address@hidden</em></a>。
 也有<a href="/contact/">別的方法可以联系</a> FSF。
-<br />
 è¯·å°†æ— æ•ˆé“¾æŽ¥å’Œå…¶ä»–æ›´æ­£æˆ–å»ºè®®å‘é€è‡³
 <a href="mailto:address@hidden";><em>address@hidden</em></a>。
 </p>
@@ -51,60 +65,26 @@
 协调和提交本文翻译请参看
 <a href="/server/standards/README.translations.html">翻译指南</a>。
 </p>
+</div>
 
 <p>
-版权所有 &copy; 2001 理查德・M・斯多尔曼
-<br />
-本文允许在不变更文件内
容的前提下刊登在任何形式的媒体中，但需保留此声明。
+版权所有 &copy; 2001 理查德・M・斯多尔曼</p>
+<p>本页面采用 <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States License</a> 许可证授权。
 </p>
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
 
-<p>
+<div class="translators-credits">
+翻译：潘永之
+</div>
+
+<p class="unprintable">
 最后更新：
 <!-- timestamp start -->
-$Date: 2012/05/14 16:35:51 $
+$Date: 2014/06/30 11:26:05 $
 <!-- timestamp end -->
 </p>
-
-<p>
-翻译：潘永之<br />
-</p>
-</div>
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
-<div id="translations">
-<h4>本页的翻译</h4>
-
-<!-- Please keep this list alphabetical, and in the original -->
-<!-- language if possible, otherwise default to English -->
-<!-- If you do not have it English, please comment what the -->
-<!-- English is.  If you add a new language here, please -->
-<!-- advise address@hidden and add it to -->
-<!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-<!--    - in /home/www/html/server/standards/README.translations.html -->
-<!--      one of the lists under the section "Translations Underway" -->
-<!--    - if there is a translation team, you also have to add an alias -->
-<!--      to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the 2 letter language code right versus -->
-<!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-
-<ul class="translations-list">
-<!-- English -->
-<li><a 
href="/philosophy/push-copyright-aside.en.html">English</a>&nbsp;[en]</li>
-<!-- Spanish -->
-<li><a 
href="/philosophy/push-copyright-aside.es.html">Espa&ntilde;ol</a>&nbsp;[es]</li>
-<!-- French -->
-<li><a 
href="/philosophy/push-copyright-aside.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li>
-<!-- Dutch -->
-<li><a 
href="/philosophy/push-copyright-aside.nl.html">Nederlands</a>&nbsp;[nl]</li>
-<!-- Polish -->
-<li><a 
href="/philosophy/push-copyright-aside.pl.html">polski</a>&nbsp;[pl]</li>
-<!-- Chinese Simplified -->
-<li><a 
href="/philosophy/push-copyright-aside.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</li>
-</ul>
 </div>
 </div>
 </body>

Index: lessig-fsfs-intro.zh-cn.html
===================================================================
RCS file: /webcvs/www/www/philosophy/lessig-fsfs-intro.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- lessig-fsfs-intro.zh-cn.html        14 May 2012 16:35:47 -0000      1.6
+++ lessig-fsfs-intro.zh-cn.html        30 Jun 2014 11:26:06 -0000      1.7
@@ -1,7 +1,16 @@
 <!--#include virtual="/server/header.zh-cn.html" -->
+ <!--#set var="ENGLISH_PAGE" value="/philosophy/lessig-fsfs-intro.en.html" -->
 
 <title>《自由软件，自由社会》的引言 - GNU 项目 - 
自由软件基金会（FSF）</title>
 
+<!-- Fixed by hand on June 6, 2014:
+     - set ENGLISH_PAGE,
+     - remove #translations,
+     - translist before banner,
+     - partially update footer.
+-->
+
+<!--#include virtual="/philosophy/po/lessig-fsfs-intro.translist" -->
 <!--#include virtual="/server/banner.zh-cn.html" -->
    
 <h2>
@@ -81,20 +90,21 @@
 <strong>斯坦福大学法学院法学教授</strong>
 </p>
 
-<h4><a href="http://shop.fsf.org/product/free-software-free-society/";>
+<hr />
+<blockquote id="fsfs"><p class="big"><a 
href="http://shop.fsf.org/product/free-software-free-society/";>
 
了解《自由软件，自由社会：理查德·马修·斯托曼选集》更多
-</a></h4>
+</a></p></blockquote>
 
 </div>
 
 <!--#include virtual="/server/footer.zh-cn.html" -->
 <div id="footer">
+<div class="unprintable">
 
 <p>
 问询 FSF 和 GNU 相关事宜请寄邮件至
 <a href="mailto:address@hidden";><em>address@hidden</em></a>。
 也有<a href="/contact/">別的方法可以联系</a> FSF。
-<br />
 è¯·å°†æ— æ•ˆé“¾æŽ¥å’Œå…¶ä»–æ›´æ­£æˆ–å»ºè®®å‘é€è‡³
 <a href="mailto:address@hidden";><em>address@hidden</em></a>。
 </p>
@@ -103,58 +113,24 @@
 协调和提交本文翻译请参看
 <a href="/server/standards/README.translations.html">翻译指南</a>。
 </p>
+</div>
 
-<p>
-Free Software Foundation, Inc.,</p>
-<address>51 Franklin St, Fifth Floor, Boston, MA 02110, USA</address>
-<p>本文允许在不变更文件内
容的前提下刊登在任何形式的媒体中，但需保留此声明。
+<p>版权所有 &copy; 2002, 2013 自由软件基金会.</p>
+<p>本页面采用 <a rel="license" 
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons 
Attribution-NoDerivs 3.0 United States License</a> 许可证授权。
 </p>
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
 
-<p>
+<div class="translators-credits">
+翻译：潘永之
+</div>
+
+<p class="unprintable">
 最后更新：
 <!-- timestamp start -->
-$Date: 2012/05/14 16:35:47 $
+$Date: 2014/06/30 11:26:06 $
 <!-- timestamp end -->
 </p>
 
-<p>
-翻译：潘永之<br />
-</p>
-</div>
-<!-- All pages on the GNU web server should have the section about    -->
-<!-- verbatim copying.  Please do NOT remove this without talking     -->
-<!-- with the webmasters first. --> 
-<!-- Please make sure the copyright date is consistent with the document -->
-<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-
-<div id="translations">
-<h4>本页的翻译</h4>
-
-<!-- Please keep this list alphabetical, and in the original -->
-<!-- language if possible, otherwise default to English -->
-<!-- If you do not have it English, please comment what the -->
-<!-- English is.  If you add a new language here, please -->
-<!-- advise address@hidden and add it to -->
-<!--    - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
-<!--    - in /home/www/html/server/standards/README.translations.html -->
-<!--      one of the lists under the section "Translations Underway" -->
-<!--    - if there is a translation team, you also have to add an alias -->
-<!--      to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the 2 letter language code right versus -->
-<!--     http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
-
-<ul class="translations-list">
-<!-- English -->
-<li><a href="/philosophy/lessig-fsfs-intro.en.html">English</a>&nbsp;[en]</li>
-<!-- Persian -->
-<li><a 
href="/philosophy/lessig-fsfs-intro.fa.html">&#x0641;&#x0627;&#x0631;&#x0633;&#x06cc;</a>&nbsp;[fa]</li>
-<!-- French -->
-<li><a 
href="/philosophy/lessig-fsfs-intro.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li>
-<!-- Dutch -->
-<li><a 
href="/philosophy/lessig-fsfs-intro.nl.html">Nederlands</a>&nbsp;[nl]</li>
-<!-- Chinese Simplified -->
-<li><a 
href="/philosophy/lessig-fsfs-intro.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</li>
-</ul>
 </div>
 </div>
 </body>