www home.zh-cn.html po/home.zh-cn.po server/bod...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/02/16 07:05:54

Modified files:
        .              : home.zh-cn.html 
        po             : home.zh-cn.po 
        server         : body-include-2.zh-cn.html 

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.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.155&r2=1.156
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.zh-cn.html?cvsroot=www&r1=1.26&r2=1.27

Patches:
Index: home.zh-cn.html
===================================================================
RCS file: /web/www/www/home.zh-cn.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- home.zh-cn.html     11 Feb 2012 01:27:58 -0000      1.47
+++ home.zh-cn.html     16 Feb 2012 07:04:46 -0000      1.48
@@ -26,10 +26,9 @@
 
       <h2>GNU 是什么？</h2>
 
-<p>GNU is a Unix-like operating system that is <a
-href="/philosophy/free-sw.html">free software</a>&mdash;it respects your
-freedom.  You can install <a href="/distros/free-distros.html">Linux-based
-versions of GNU</a> which are entirely free software.</p>
+<p>GNU 是一个由 <a href="/philosophy/free-sw.html">自由软件</a> 
构成的类 Unix 操作系统 &mdash;
+è‡ªç”±è½¯ä»¶å°Šé‡ä½ çš„è‡ªç”±ã€‚ä½ å¯ä»¥é€‰æ‹©å®‰è£…ä¸€ä¸ªå®Œå…
¨ç”±è‡ªç”±è½¯ä»¶æž„成的 <a href="/distros/free-distros.html">基于 Linux
+å†…æ ¸çš„ GNU 系统</a>。</p>
 
 <p class="c"><a href="/distros/screenshot.html"><img
    src="/graphics/t-desktop-4-small.jpg" alt="GNU的截图"
@@ -41,16 +40,14 @@
 "GNU" is pronounced <em>g'noo</em></a>, as one syllable, like saying "grew"
 but replacing the <em>r</em> with <em>n</em>.</p>
 
-<p>A Unix-like operating system is a <a href="/software/">software
-collection</a> of applications, libraries, and developer tools, plus a
-program to allocate resources and talk to the hardware, known as a kernel.</p>
-
-<p><a href="/software/hurd/hurd.html">The Hurd, GNU's own kernel</a>, is some
-way from being ready for daily use.  Thus, GNU is typically used today with
-a kernel called Linux.  This combination is the <a
-href="/gnu/linux-and-gnu.html"> <strong>GNU/Linux operating
-system</strong></a>.  GNU/Linux is used by millions, though many <a
-href="/gnu/gnu-linux-faq.html"> call it "Linux" by mistake</a>.</p>
+<p>ç±» Unix 操作系统是由一系列应用程序、系统库和开发工å…
·æž„成的 <a href="/software/">软件集合</a> ,
+å¹¶åŠ ä¸Šç”¨äºŽèµ„æºåˆ†é…å’Œç¡¬ä»¶ç®¡ç†çš„å†…æ ¸ã€‚</p>
+
+<p><a href="/software/hurd/hurd.html">GNU è‡ªå·±çš„å†…æ ¸ Hurd</a>
+ä»åœ¨å¼€å‘ä¸­ï¼Œç¦»å®žç”¨è¿˜æœ‰ä¸€å®šçš„è·ç¦»ã€‚å› æ­¤ï¼ŒçŽ°åœ¨çš„ GNU 
通常使用 Linux å†…æ ¸ã€‚è¿™æ ·çš„ç»„åˆå³ä¸º<a
+href="/gnu/linux-and-gnu.html"> <strong>GNU/Linux
+操作系统</strong></a>。已经有上百万人在使用 
GNU/Linux，但他们中的很多人把它误称为<a
+href="/gnu/gnu-linux-faq.html">“Linux”</a>。</p>
 
 <!--
    Keep link lines at 72 characters or lynx will break them poorly.
@@ -72,7 +69,7 @@
    Please don't make it GNU's Flash.
 -->
 <h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a
-href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" 
alt="RSS Feed" /></a></h4>
+href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" 
alt="RSS 订阅" /></a></h4>
 
 <!--
    FOR ENTRIES ADDED TO GNUs FLASHES:
@@ -89,7 +86,7 @@
    MORE THAN 2 ITEMS HERE.
 -->
 <!--#include virtual="/planetfeeds.html" -->
-<p>更多新闻，请访问 <a 
href="http://planet.gnu.org/";>planet.gnu.org</a>。</p>
+<p>更多新闻，请访问 <a href="http://planet.gnu.org/";>Planet 
GNU</a>。</p>
 
 <!-- END GNUFlashes -->
 <h4>GNU Guile</h4>
@@ -146,14 +143,11 @@
 <li><strong><a 
href="/server/takeaction.html#wipochange">呼吁WIPO</a></strong>
 改变其名字和任务.</li>
 
-<li>Support the efforts on net neutrality in Europe, <a
-href="http://www.savetheinternet.com"; title="Net neutrality in the United
-States of America">in the USA</a> and <a href="http://www.neutrality.ca";
-title="Net neutrality in Canada">in Canada</a>.</li>
-
-<li>Students! <a
-href="http://www.aful.org/communiques/univ-offers-me-windows";>Claim a refund
-on your unused Microsoft Windows licences</a>.</li>
+<li>支持欧洲、 <a href="http://www.savetheinternet.com"; 
title="美国的网络中立行动">美国</a> 和 <a
+href="http://www.neutrality.ca"; title="åŠ æ‹¿å¤§çš„ç½‘ç»œä¸­ç«‹è¡ŒåŠ¨"> åŠ 
拿大 </a> 的网络中立行动。</li>
+
+<li><a 
href="http://www.aful.org/communiques/univ-offers-me-windows";>学生们！
+ä¸ºä½ ä»¬æœªä½¿ç”¨çš„ Microsoft Windows 许可证索取退款</a></li>
 
 <li><a href="/server/takeaction.html#directory">åŠ å…
¥è‡ªç”±è½¯ä»¶ç›®å½•</a>。</li>
 
@@ -167,32 +161,32 @@
 
 <div class="yui-g highlight-para">
 
-<p><strong>Can you contribute to any of these <a
-href="http://www.fsf.org/campaigns/priority-projects/";>High Priority
-Projects</a>?</strong> Gnash, coreboot, free distributions of GNU/Linux, GNU
-Octave, drivers for network routers, reversible debugging in GDB, automatic
-transcription, PowerVR drivers, and also free software replacements for
-Skype, OpenDWG libraries, and Oracle Forms.</p>
-
-<p id="unmaint"><strong>Can you take over an <a
-href="/server/takeaction.html#unmaint">unmaintained GNU
-package</a>?</strong> <a href="/software/alive/">alive</a>, <a
+<p><strong>您能为这些 <a
+href="http://www.fsf.org/campaigns/priority-projects/";>高优å…
ˆçº§çš„项目</a>åšå‡ºè´¡çŒ®ç ï¼Ÿ</strong>
+Gnash, coreboot, 自由的 GNU/Linux 发行版, GNU Octave,
+网络路由器驱动，GDB的反向调试，自动视频编ç 
è½¬æ¢ï¼ŒPowerVR 驱动，还有 Skype, OpenDWG 库和 Oracle Forms
+的自由软件替代品。</p>
+
+<p id="unmaint"><strong>ä½ èƒ½å¸®åŠ©æŽ¥æ‰‹ä¸‹åˆ— <a 
href="/server/takeaction.html#unmaint">失去维护的 GNU 软件包</a>
+吗？</strong> <a href="/software/alive/">alive</a>, <a
 href="/software/dotgnu-forum/">dotgnu-forum</a>, <a
 href="/software/dr-geo/">dr-geo</a>, <a
+href="/software/ggradebook/">ggradebook</a>, <a
+href="/software/gift/">gift</a>, <a href="/software/gleem/">gleem</a>, <a
 href="/software/gnu-queue/">gnu-queue</a>, <a
 href="/software/goldwater/">goldwater</a>, <a
-href="/software/gsrc/">gsrc</a>, <a href="/software/halifax/">halifax</a>,
-<a href="/software/metahtml/">metahtml</a>, <a
+href="/software/halifax/">halifax</a>, <a href="/software/leg/">leg</a>, <a
+href="/software/maverik/">maverik</a>, <a
 href="/software/orgadoc/">orgadoc</a>, <a
 href="/software/pgccfd/">pgccfd</a>, <a
 href="/software/polyxmass/">polyxmass</a>, <a
 href="/software/quickthreads/">quickthreads</a>, <a
 href="/software/snakecharmer/">snakecharmer</a>, <a
 href="/software/sxml/">sxml</a>, <a
-href="/software/trueprint/">trueprint</a> are all <a
-href="/server/takeaction.html#unmaint">looking for maintainers</a>.  We also
-need <a href="/server/takeaction.html#python_configure">GNU configure for
-Python packages</a>.</p>
+href="/software/trueprint/">trueprint</a> 这些项目正在 <a
+href="/server/takeaction.html#unmaint">寻找维护人</a>。我们还需要为
 <a
+href="/server/takeaction.html#python_configure">Python 软件包提供 GNU
+configure</a>。</p>
 
 </div>
 </div>
@@ -220,22 +214,22 @@
 </a>，<a href="http://www.fsfla.org/";> 拉丁美洲 </a> 和 <a
 href="http://fsf.org.in/";> 印度 </a> 也有姊妹组织。</p>
 
-<p>This page is licensed under a <a rel="license"
+<p>本页面采用 <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a>.
+Attribution-NoDerivs 3.0 United States License</a> 许可证授权。
 </p>
 
 
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<b>翻译</b>: 刘昭宏，潘永之，李凡希 2007, 2008, 2009, 2010, 
2011</div>
+<b>翻译</b>: 刘昭宏，潘永之，李凡希 2007, 2008, 2009, 2010, 2011, 
2012</div>
 
 
  <p><!-- timestamp start -->
 最后更新：
 
-$Date: 2012/02/11 01:27:58 $
+$Date: 2012/02/16 07:04:46 $
 
 <!-- timestamp end -->
 </p>

Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- po/home.zh-cn.po    16 Feb 2012 06:58:03 -0000      1.155
+++ po/home.zh-cn.po    16 Feb 2012 07:05:16 -0000      1.156
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-10 20:26-0500\n"
 "Language: zh\n"
 "Plural-Forms: \n"
 

Index: server/body-include-2.zh-cn.html
===================================================================
RCS file: /web/www/www/server/body-include-2.zh-cn.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/body-include-2.zh-cn.html    7 Dec 2011 20:00:53 -0000       1.26
+++ server/body-include-2.zh-cn.html    16 Feb 2012 07:05:28 -0000      1.27
@@ -3,7 +3,7 @@
 <div id="header">
         <div class="inner" style="position: relative;">
 
-        <h1 id="logo"><a href="/">The GNU Operating System</a></h1>
+        <h1 id="logo"><a href="/home.zh-cn.html">GNU 操作系统</a></h1>
 
 
 
@@ -23,7 +23,7 @@
  -->
 <!-- <input name="_qf_default" type="hidden" value="Edit:cancel" />
  -->
-<a href="https://my.fsf.org/associate/support_freedom?referrer=10189";><img 
src="https://static.fsf.org/nosvn/appeal2011/gnu-1.png"; alt="Help us raise 
$300,000 for free software by January 30th" /><!-- </div>
+<a href="https://my.fsf.org/associate/support_freedom?referrer=10189";><img 
src="https://static.fsf.org/nosvn/appeal2011/gnu-1.png"; 
alt="帮助自由软件在 1 月 30 日前募集到 300000 美元" /><!-- </div>
  -->
 <!--     <p>
 <label>Enter your email address (e.g. address@hidden)</label></p><p><input 
type="text" id="frmEmail" name="email-Primary" size="15" maxlength="80" /> 
&nbsp; <input type="submit" name="_qf_Edit_next" value="Ok" /></p> -->
@@ -54,7 +54,7 @@
 <ul>
    <li id="tabPhilosophy"><a 
href="/philosophy/philosophy.zh-cn.html">哲学</a></li>
    <li id="tabLicenses"><a href="/licenses/licenses.html">许可证</a></li>
-   <li id="tabEducation"><a href="/education/education.html">Education</a></li>
+   <li id="tabEducation"><a href="/education/education.html">教育</a></li>
    <li id="tabSoftware"><a href="/software/software.html">下载</a></li>
    <li id="tabDoc"><a href="/doc/doc.html">文档</a></li>
    <li id="tabHelp"><a href="/help/help.html">帮助 GNU</a></li>