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>—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 æä½ç³»ç» —
+èªç±è½¯ä»¶å°éä½ çèªç±ãä½ å¯ä»¥éæ©å®è£
ä¸ä¸ªå®å
¨ç±èªç±è½¯ä»¶ææç
<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.
rich...@example.com)</label></p><p><input type="text" id="frmEmail"
name="email-Primary" size="15" maxlength="80" /> <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>
![https://static.fsf.org/nosvn/appeal2011/gnu-1.png"](https://static.fsf.org/nosvn/appeal2011/gnu-1.png"){kind=link}