CVSROOT: /web/www
Module name: www
Changes by: Yavor Doganov <yavor> 10/08/12 00:27:07
Modified files:
server : body-include-1.zh-cn.html
body-include-2.zh-cn.html
footer-text.zh-cn.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-1.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/footer-text.zh-cn.html?cvsroot=www&r1=1.5&r2=1.6
Patches:
Index: body-include-1.zh-cn.html
===================================================================
RCS file: /web/www/www/server/body-include-1.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- body-include-1.zh-cn.html 18 May 2010 20:26:15 -0000 1.3
+++ body-include-1.zh-cn.html 12 Aug 2010 00:27:01 -0000 1.4
@@ -1,4 +1,3 @@
-<div id="toplinks"><span class="netscape4"><a href="#content">Skip to
content</a> | <a
-href="#navigation">Skip to navigation</a> | <a href="#searcher">Skip to
-search</a>| </span><a href="#translations">Translations of this page</a> |
-<a href="/accessibility/">Accessibility</a></div>
+<div id="toplinks"><span class="netscape4"><a href="#content">è·³è³æ£æ</a>
| <a
+href="#navigation">è·³è³å¯¼èª</a> | <a href="#searcher">è·³è³æç´¢</a>|
</span><a
+href="#translations">å
¶å®è¯è¨</a> | <a
href="/accessibility/">æ éç¢å£°æ</a></div>
Index: body-include-2.zh-cn.html
===================================================================
RCS file: /web/www/www/server/body-include-2.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- body-include-2.zh-cn.html 30 Apr 2010 20:26:23 -0000 1.4
+++ body-include-2.zh-cn.html 12 Aug 2010 00:27:01 -0000 1.5
@@ -3,8 +3,7 @@
<h1 id="logo"><a href="/">GNU æä½ç³»ç»</a></h1>
- <div style="position: absolute; top: -20px; right: 0; width:
344px;"><a href="http://patentabsurdity.com/watch.html"; title="Watch Patent
-Absurdity"><img src="http://static.fsf.org/nosvn/pa-gnu.jpg"; alt="" /></a>
+ <div style="position: absolute; top: -20px; right: 0; width:
344px;"><a href="http://patentabsurdity.com/watch.html";
title="è§çã软件ä¸å©çèè°¬æ§ã"><img
src="http://static.fsf.org/nosvn/pa-gnu.jpg"; alt="" /></a>
</div>
<!-- <div id="fssbox">
@@ -25,19 +24,19 @@
<ul>
<li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">å²å¦</a></li>
<li id="tabLicenses"><a
href="/licenses/licenses.html">许å¯è¯</a></li>
- <li id="tabSoftware"><a
href="/software/software.html">Downloads</a></li>
- <li id="tabDoc"><a href="/doc/doc.html">Documentation</a></li>
- <li><a href="/help/help.html">Help GNU</a></li>
- <li id="joinfsftab"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join
-the FSF!</a></li>
+ <li id="tabSoftware"><a
href="/software/software.html">ä¸è½½</a></li>
+ <li id="tabDoc"><a href="/doc/doc.html">ææ¡£</a></li>
+ <li><a href="/help/help.html">å¸®å© GNU</a></li>
+ <li id="joinfsftab"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>ä»å¤©å°±å å
¥
+FSFï¼</a></li>
</ul>
<div id="searcher">
<form method="get" action="http://www.gnu.org/cgi-bin/estseek.cgi";>
- <div><label class="netscape4" for="phrase">Search:</label> <input
name="phrase"
+ <div><label class="netscape4" for="phrase">æç´¢ï¼</label> <input
name="phrase"
id="phrase" type="text" size="18" accesskey="s" value="Why GNU/Linux?" />
-<input type="submit" value="Search" /></div>
+<input type="submit" value="æç´¢" /></div>
</form>
</div>
Index: footer-text.zh-cn.html
===================================================================
RCS file: /web/www/www/server/footer-text.zh-cn.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- footer-text.zh-cn.html 19 Jun 2010 20:25:43 -0000 1.5
+++ footer-text.zh-cn.html 12 Aug 2010 00:27:01 -0000 1.6
@@ -6,59 +6,55 @@
<div class="yui-u first" id="sitemap-1">
- <p class="netscape4"><a href="#footer">Skip sitemap</a> or <a
href="#sitemap-2">skip to licensing
-items</a></p>
+ <p class="netscape4"><a href="#footer">è·³è³ç½ç«å°å¾</a> æ <a
href="#sitemap-2">è¯å¯è¯æ¡ç®</a></p>
<ul>
- <li><a href="/gnu/gnu-history.html">GNU History</a></li>
- <li><a href="/help/">Get involved</a>
+ <li><a href="/gnu/gnu-history.html">GNU åå²</a></li>
+ <li><a href="/help/">å¸®å© GNU</a>
<ul>
- <li><a href="http://savannah.gnu.org/people/?type_id=1";>Projects
that need
-help</a></li>
- <li><a
href="/server/standards/translations/priorities.html#Languages">Help
-translate this website</a></li>
+ <li><a
href="http://savannah.gnu.org/people/?type_id=1";>éè¦å¸®å©ç项ç®</a></li>
+ <li><a
+href="/server/standards/translations/priorities.html#Languages">åä¸ç½ç«ç¿»è¯</a></li>
</ul></li>
- <li><a href="/server/takeaction.html#unmaint">Take over an unmaintained
-package</a></li>
- <li><a href="/server/takeaction.html#gnustep">Use GNUstep</a></li>
- <li><a href="/distros/free-distros.html">Download GNU</a></li>
- <li><a href="http://directory.fsf.org/GNU/";>GNU packages</a></li>
- <li><a href="/manual/manual.html">Free documentation</a></li>
- <li><a href="http://lists.gnu.org/";>GNU mailing lists</a></li>
+ <li><a
href="/server/takeaction.html#unmaint">æ¥æ失å»æ¨æ¤ç软件å
</a></li>
+ <li><a href="/server/takeaction.html#gnustep">ä½¿ç¨ GNUstep</a></li>
+ <li><a href="/distros/free-distros.html">ä¸è½½ GNU 软件</a></li>
+ <li><a href="http://directory.fsf.org/GNU/";>GNU 软件å
</a></li>
+ <li><a href="/manual/manual.html">èªç±ææ¡£</a></li>
+ <li><a href="http://lists.gnu.org/";>GNU é®ä»¶å表</a></li>
<li><a href="http://savannah.gnu.org/";>GNU savannah</a></li>
- <li><a href="http://libreplanet.org/";>Connect with free software
users</a></li>
- <li><a href="/people/">GNU's Who?</a></li>
- <li><a href="http://planet.gnu.org/";>Planet GNU</a></li>
- <li><a href="/contact/gnu-advisory.html">GNU Advisory Committee</a></li>
+ <li><a href="http://libreplanet.org/";>å¢ç»èªç±è½¯ä»¶ç¨æ·</a></li>
+ <li><a href="/people/">GNU 人ç©</a></li>
+ <li><a href="http://planet.gnu.org/";>GNU æç</a></li>
+ <li><a href="/contact/gnu-advisory.html">GNU å¨è¯¢å§åä¼</a></li>
</ul>
</div>
<div class="yui-u" id="sitemap-2">
- <p class="netscape4"><a href="#sitemap-3">Skip to general
items</a></p>
+ <p class="netscape4"><a href="#sitemap-3">è·³è³ä¸»é¢æ¡ç®</a></p>
<ul>
- <li><a href="http://www.fsf.org/licensing";>Software licensing</a>
+ <li><a href="http://www.fsf.org/licensing";>软件许å¯è¯</a>
<ul>
- <li><a href="http://www.fsf.org/licensing/education";>Licensing
education</a></li>
- <li><a href="/licenses">Free software licenses</a>
+ <li><a
href="http://www.fsf.org/licensing/education";>许å¯è¯æè²</a></li>
+ <li><a href="/licenses">èªç±è½¯ä»¶è®¸å¯è¯</a>
<ul>
<li><a href="/licenses/gpl.html">GNU GPL</a></li>
<li><a href="/licenses/agpl.html">GNU AGPL</a></li>
<li><a href="/licenses/lgpl.html">GNU LGPL</a></li>
<li><a href="/licenses/fdl.html">GNU FDL</a></li></ul></li>
- <li><a href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
- <li><a href="/licenses/gpl-faq.html">Licensing compliance</a></li>
- <li><a href="/licenses/gpl-faq.html">How to use GNU licenses for your
own
-software</a></li></ul></li>
- <li><a href="http://www.fsf.org/resources/service/";>GNU Service
Directory</a></li>
- <li><a href="/fun/fun.html">GNU Fun</a></li>
- <li><a href="/graphics/graphics.html">GNU Art</a></li>
- <li><a href="/music/music.html">Music & Songs</a></li>
+ <li><a
href="/licenses/gpl-faq.html">软件许å¯è¯å¸¸è§é®é¢</a></li>
+ <li><a href="/licenses/gpl-faq.html">éµå®è®¸å¯è¯æ¡æ¬¾</a></li>
+ <li><a href="/licenses/gpl-faq.html">å¦ä½ä¸ºä½ å¼åç软件使ç¨
GNU 许å¯è¯</a></li></ul></li>
+ <li><a href="http://www.fsf.org/resources/service/";>GNU
æå¡ç®å½</a></li>
+ <li><a href="/fun/fun.html">精彩 GNU</a></li>
+ <li><a href="/graphics/graphics.html">GNU èºæ¯</a></li>
+ <li><a href="/music/music.html">é³ä¹ä¸ææ²</a></li>
</ul>
@@ -68,54 +64,52 @@
<div class="yui-g first">
<div class="yui-u first" id="sitemap-3">
- <p class="netscape4"><a href="#sitemap-4">Skip to philosophical
items</a></p>
+ <p class="netscape4"><a href="#sitemap-4">è·³è³å²å¦æ¡ç®</a></p>
<ul>
- <li><a href="http://www.fsf.org/news/";>Latest News</a><ul>
- <li><a href="http://www.fsf.org/events/";>Upcoming Events</a></li>
- <li><a href="http://www.fsf.org/blogs/";>FSF Blogs</a></li></ul></li>
- <li><a href="http://www.fsf.org/volunteer";>Volunteering and
internships</a></li>
- <li><a href="http://www.fsf.org/resources/hw";>Hardware Database</a></li>
- <li><a href="http://directory.fsf.org";>Free Software Directory</a></li>
-
- <li><a href="http://www.fsf.org/resources/";>Free Software
Resources</a></li>
- <li><a href="http://www.fsf.org/associate/";>Associate Members</a></li>
- <li><a href="http://www.fsf.org/associate/account/";>My FSF
Account</a></li>
- <li class="noright"><a
href="http://www.fsf.org/about/contact.html";>Contact the FSF</a></li>
- <li><a href="http://audio-video.gnu.org/";>GNU Audio/Video</a></li>
-<li><a href="/accessibility/accessibility.html">Accessibility
Statement</a></li>
-<li><a href="http://ftp.gnu.org/gnu/";>GNU FTP Site</a> and <a
-href="/prep/ftp.html">mirrors</a></li>
-<li><a href="/people/speakers.html">GNU Speakers</a></li>
-<li><a href="http://www.fsf.org/jobs";>Free software jobs</a></li>
+ <li><a href="http://www.fsf.org/news/";>ææ°æ¶æ¯</a><ul>
+ <li><a href="http://www.fsf.org/events/";>å³å°ä¸¾åçæ´»å¨</a></li>
+ <li><a href="http://www.fsf.org/blogs/";>FSF å客</a></li></ul></li>
+ <li><a href="http://www.fsf.org/volunteer";>å¿æ¿è
ä¸å®ä¹ ç</a></li>
+ <li><a href="http://www.fsf.org/resources/hw";>硬件æ°æ®åº</a></li>
+ <li><a href="http://directory.fsf.org";>èªç±è½¯ä»¶ç®å½</a></li>
+
+ <li><a href="http://www.fsf.org/resources/";>èªç±è½¯ä»¶èµæº</a></li>
+ <li><a href="http://www.fsf.org/associate/";>FSFåä¼å</a></li>
+ <li><a href="http://www.fsf.org/associate/account/";>æç FSF
å¸æ·</a></li>
+ <li class="noright"><a
href="http://www.fsf.org/about/contact.html";>èç³» FSF</a></li>
+ <li><a href="http://audio-video.gnu.org/";>GNU é³é¢/è§é¢</a></li>
+<li><a href="/accessibility/accessibility.html">æ éç¢å£°æ</a></li>
+<li><a href="http://ftp.gnu.org/gnu/";>GNU FTP ç«ç¹</a> ä¸ <a
+href="/prep/ftp.html">é象</a></li>
+<li><a href="/people/speakers.html">GNU åè¨äºº</a></li>
+<li><a href="http://www.fsf.org/jobs";>èªç±è½¯ä»¶èä¸</a></li>
</ul>
</div>
<div class="yui-u" id="sitemap-4">
- <p class="netscape4"><a href="#ft">Skip list</a></p>
+ <p class="netscape4"><a href="#ft">è·³è¿å表</a></p>
<ul>
- <li><a href="http://donate.fsf.org";>Donate to the FSF</a></li>
- <li><a href="http://www.fsf.org/jfb";>Join the FSF</a></li>
+ <li><a href="http://donate.fsf.org";>èµå© FSF</a></li>
+ <li><a href="http://www.fsf.org/jfb";>å å
¥ FSF</a></li>
- <li><a href="/philosophy/">Free software philosophy</a><ul>
- <li><a href="/philosophy/free-sw.html">The Free Software
Definition</a></li>
- <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic
Idealism</a></li>
- <li><a href="/philosophy/free-doc.html">Free Software and Free
Manuals</a></li>
- <li><a href="/philosophy/selling.html">Selling Free Software</a></li>
- <li><a href="/philosophy/fs-motives.html">Motives for Writing Free
Software</a></li>
-
- <li><a href="/philosophy/right-to-read.html">The Right To Read</a></li>
- <li><a href="/philosophy/open-source-misses-the-point.html">Why Open
Source
-Misses the Point of Free Software</a></li></ul></li>
- <li><a href="/software/for-windows.html">Free software for
Windows</a></li>
- <li><a href="http://defectivebydesign.org/";>Defective by Design
— Fight
-DRM</a></li>
- <li><a href="http://windows7sins.org/";>Windows 7 Sins</a></li>
- <li><a href="http://playogg.org/";>Support free media formats</a></li>
+ <li><a href="/philosophy/">èªç±è½¯ä»¶å²å¦</a><ul>
+ <li><a href="/philosophy/free-sw.html">èªç±è½¯ä»¶å®ä¹</a></li>
+ <li><a
href="/philosophy/pragmatic.html">Copyleftï¼å¡å®ççæ³ä¸»ä¹</a></li>
+ <li><a
href="/philosophy/free-doc.html">èªç±è½¯ä»¶ä¸èªç±ææ¡£</a></li>
+ <li><a href="/philosophy/selling.html">åºå®èªç±è½¯ä»¶</a></li>
+ <li><a
href="/philosophy/fs-motives.html">为ä»ä¹è¦ç¼åèªç±è½¯ä»¶</a></li>
+
+ <li><a href="/philosophy/right-to-read.html">é
读çæå</a></li>
+ <li><a
href="/philosophy/open-source-misses-the-point.html">为ä»ä¹å¼æºä¸åäºèªç±è½¯ä»¶</a></li></ul></li>
+ <li><a href="/software/for-windows.html">Windowsçèªç±è½¯ä»¶</a></li>
+ <li><a href="http://defectivebydesign.org/";>ä»è®¾è®¡ä¸é²å¾¡ —
å对 DRM</a></li>
+ <li><a href="http://windows7sins.org/";>罪æ¶ç Windows 7</a></li>
+ <li><a href="http://playogg.org/";>æ¯æèªç±å¤åªä½æä»¶æ ¼å¼</a></li>
</ul>
</div>
</div>
@@ -123,16 +117,13 @@
<div class="yui-g" id="mission-statement">
-<p><small>The <a href="http://www.fsf.org";>Free Software Foundation</a> is the
-principal organizational sponsor of the <a href="http://www.gnu.org/";>GNU
-Operating System</a>. <strong>Our mission is to preserve, protect and
-promote the freedom to use, study, copy, modify, and redistribute computer
-software, and to defend the rights of Free Software users.</strong></small></p>
-
-<p><small><strong>Support GNU and the FSF by <a
-href="http://shop.fsf.org/";>buying manuals and gear</a>, <a
-href="http://www.fsf.org/join";>joining the FSF as an associate member</a> or
-by <a href="http://donate.fsf.org/";>making a donation</a>.</strong></small></p>
+<p><small><a href="http://www.fsf.org";>èªç±è½¯ä»¶åºéä¼</a> æ¯ <a
+href="http://www.gnu.org/";>GNU æä½ç³»ç»</a> ç主è¦èµå©ç»ç»ã
+<strong>æ们çç®æ æ¯ä¿æãä¿æ¤åä¿è¿è®¡ç®æºç¨æ·å
·æ使ç¨ãå¦ä¹ ãå¤å¶ãä¿®æ¹ååå计ç®æºè½¯ä»¶çèªç±ï¼æå«èªç±è½¯ä»¶ç¨æ·çæåã</strong></small></p>
+
+<p><small><strong>éè¿ <a href="http://shop.fsf.org/";>è´ä¹° GNU
æååè£
å¤</a> ã <a
+href="http://www.fsf.org/join";>æ为FSFåä¼å</a> æ <a
+href="http://donate.fsf.org/";>为 GNU æ款</a>æ¯æ GNU å
FSFã</strong></small></p>
<p id="backtotop"><a href="#header">è¿å顶é¨</a></p>
![http://static.fsf.org/nosvn/pa-gnu.jpg"](http://static.fsf.org/nosvn/pa-gnu.jpg"){kind=link}