CVSROOT: /web/www
Module name: www
Changes by: Yavor Doganov <yavor> 11/05/01 16:26:06
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.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.zh-cn.html?cvsroot=www&r1=1.13&r2=1.14
Patches:
Index: home.zh-cn.html
===================================================================
RCS file: /web/www/www/home.zh-cn.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- home.zh-cn.html 5 Apr 2011 00:27:49 -0000 1.14
+++ home.zh-cn.html 1 May 2011 16:25:12 -0000 1.15
@@ -56,10 +56,8 @@
<p>ç± <a href="/gnu/linux-and-gnu.html">GNU å Linux</a> ç»æç
<strong>GNU/Linux
æä½ç³»ç»</strong>,
ç®åææ°ç¾ä¸ç¨æ·ï¼ä½å®å¸¸å¸¸è¢«é误çç®ç§°ä¸ºâLinuxâã</p>
-<p>The name “GNU” is a recursive acronym for “GNU's Not
-Unix!”; <a href="/pronunciation/pronunciation.html">it is pronounced
-<em>g-noo</em></a>, as one syllable with no vowel sound between the
-<em>g</em> and the <em>n</em>.</p>
+<p>GNU è¿ä¸ªååæ¯ âGNU's Not Unix!â
çéå½é¦åæ¯ç¼©åè¯ãå®çåé³ä¸º <em> g-noo </em>ï¼ <em>g</em> å
+<em>n</em> ä¹é´æ²¡æå
é³ï¼æ以åªæä¸ä¸ªé³èã</p>
<!--
Keep link lines at 72 characters or lynx will break them poorly.
@@ -232,7 +230,7 @@
<p><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2011/04/05 00:27:49 $
+$Date: 2011/05/01 16:25:12 $
<!-- timestamp end -->
</p>
Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- po/home.zh-cn.po 1 May 2011 10:35:00 -0000 1.127
+++ po/home.zh-cn.po 1 May 2011 16:25:49 -0000 1.128
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: home.shtml\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-14 12:27-0500\n"
+"POT-Creation-Date: 2011-04-04 20:27-0300\n"
"PO-Revision-Date: 2011-05-01 06:04-0400\n"
"Last-Translator: Li Fanxi <lifa...@freemindworld.com>\n"
"Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n"
@@ -18,10 +18,12 @@
"Plural-Forms: \n"
# type: Content of: <title>
+#. type: Content of: <title>
msgid "The GNU Operating System"
msgstr "GNU æä½ç³»ç»"
# type: Attribute 'content' of: <meta>
+#. type: Attribute 'content' of: <meta>
msgid ""
"GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
"Operating System, GNU Kernel, GNU Hurd"
@@ -30,6 +32,7 @@
"æ ¸, GNU Hurd"
# type: Attribute 'content' of: <meta>
+#. type: Attribute 'content' of: <meta>
msgid ""
"Since 1983, developing the free Unix style operating system GNU, so that "
"computer users can have the freedom to share and improve the software they "
@@ -39,14 +42,17 @@
"ç¨ç软件çèªç±ã"
# type: Attribute 'title' of: <link>
+#. type: Attribute 'title' of: <link>
msgid "What's New"
msgstr "æè¿æ´æ°"
# type: Attribute 'title' of: <link>
+#. type: Attribute 'title' of: <link>
msgid "New Free Software"
msgstr "æ°èªç±è½¯ä»¶"
# type: Content of: <p>
+#. type: Content of: <p>
msgid ""
"Richard Stallman announced in September 1983 the plan to develop a free "
"software Unix-like operating system called GNU. GNU is the only operating "
@@ -56,12 +62,14 @@
"个计å被称为 GNU ã GNU
æ¯å¯ä¸ä¸ä¸ªä¸ºç¨æ·çèªç±è设计çæä½ç³»ç»ã"
# type: Content of: <div><ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"http://ma.aclu.org/site/R?i=GFduzww44T4ttMzabqwBig..\";>Shame on "
"Massachusetts for censoring the Internet</a>"
msgstr ""
# type: Content of: <div><ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"http://www.fsf.org/tasks/noscript\";>Can you help us modify "
"NoScript so it can detect and block nontrivial nonfree JavaScript code?</a>"
@@ -70,14 +78,7 @@
"å®å¯ä»¥æ£æµåé»æ¢éèªç±çJavaScript代ç ã</a>"
# type: Content of: <div><ul><li>
-msgid ""
-"<a href=\"http://yourfreedom.hmg.gov.uk/repealing-unnecessary-laws/digital-";
-"economy-act\">UK citizens: help repeal the Digital Economy Act</a>"
-msgstr ""
-"<a href=\"http://yourfreedom.hmg.gov.uk/repealing-unnecessary-laws/digital-";
-"economy-act\">è±å½å
¬æ°ï¼åä¸æ¤æ¶æ°åç»æµæ³æ¡è¡å¨</a>"
-
-# type: Content of: <div><ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"http://www.aful.org/communiques/univ-offers-me-windows\";>Students! "
"Claim a refund on your unused Microsoft Windows licences</a>"
@@ -86,6 +87,7 @@
"ä¸ºä½ ä»¬æªä½¿ç¨ç Microsoft Windows 许å¯è¯ç´¢åé款 </a>"
# type: Content of: <div><ul><li>
+#. type: Content of: <div><ul><li>
msgid ""
"<a href=\"http://www.openrightsgroup.org/orgwiki/index.php/Net_Neutrality\";> "
"Support the efforts on net neutrality in Europe</a>, <a href=\"http://www.";
@@ -99,75 +101,129 @@
"neutrality in Canada\"> å æ¿å¤§ </a> çç½ç»ä¸ç«è¡å¨ã"
# type: Content of: <h2>
+#. type: Content of: <div><div><h2>
msgid "What is GNU?"
msgstr "GNU æ¯ä»ä¹ï¼"
# type: Content of: <table><tr><td><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/gnu/gnu.html\">The GNU Project</a> was launched in 1984 to "
+#| "develop a complete Unix-like operating system which is <a href=\"/"
+#| "philosophy/free-sw.html\">free software</a>—software which respects "
+#| "your freedom."
msgid ""
"<a href=\"/gnu/gnu.html\">The GNU Project</a> was launched in 1984 to "
-"develop a complete Unix-like operating system which is <a href=\"/philosophy/"
-"free-sw.html\">free software</a>—software which respects your freedom."
+"develop the GNU operating system, a complete Unix-like operating system "
+"which is <a href=\"/philosophy/free-sw.html\">free software</a>—"
+"software which respects your freedom."
msgstr ""
"<a href=\"/gnu/gnu.html\">GNU å·¥ç¨</a>
åå§äºä¸ä¹å
«åå¹´ï¼æ¨å¨å¼åä¸ä¸ªå®æ´çç±»"
"ä¼¼äº Unix çæä½ç³»ç»ï¼è¿ä¸ªç³»ç»å
¨é¨ç± <a
href=\"/philosophy/free-sw.html\">èª"
"ç±è½¯ä»¶</a> ææï¼èªç±è½¯ä»¶å
åå°éæ¨çèªç±ã"
# type: Content of: <ul><li>
+#. type: Content of: <div><div><p><a>
msgid "<a href=\"/distros/screenshot.html\">"
msgstr "<a href=\"/distros/screenshot.html\">"
# type: Attribute 'alt' of: <div><div><p><a><img>
+#. type: Attribute 'alt' of: <div><div><p><a><img>
msgid "Screenshot of GNU"
msgstr "GNUçæªå¾"
# type: Content of: <p>
+#. type: Content of: <div><div><p>
msgid "</a>"
msgstr "</a>"
# type: Content of: <div><div><p>
-msgid ""
-"Unix-like operating systems are built from a <a href=\"/software/"
-"\">collection</a> of applications, libraries, and developer tools—plus "
-"a program to allocate resources and talk to the hardware, known as a kernel."
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Unix-like operating systems are built from a <a href=\"/software/"
+#| "\">collection</a> of applications, libraries, and developer tools—"
+#| "plus a program to allocate resources and talk to the hardware, known as a "
+#| "kernel."
+msgid ""
+"Unix-like operating systems are built from 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."
msgstr ""
"ç±» Unix æä½ç³»ç»éè¿ <a href=\"/software/\">ä¸ç³»å</a>
åºç¨ç¨åºãç³»ç»åºåå¼å"
"å·¥å
·æ建, 并å ä¸ç¨äºèµæºåé
å硬件管ççå
æ ¸ã"
-# type: Content of: <div><div><p>
+#. type: Content of: <div><div><p>
msgid ""
-"<a href=\"/software/hurd/\">The Hurd, GNU's kernel</a>, is actively "
-"developed, but is still some way from being ready for daily use, so GNU is "
-"<a href=\"/gnu/gnu-linux-faq.html\">often used with a kernel called Linux</"
-"a>."
-msgstr ""
-"<a href=\"/software/hurd/\">GNUçå
æ ¸ - Hurd</a>
æ£å¨ç§¯æçå¼åä¸ï¼ä½ä»æªè¾¾å°"
-"å¯ä»¥æ¥å¸¸ä½¿ç¨çç¨åº¦ï¼æ以ç®å GNU <a
href=\"/gnu/gnu-linux-faq.html\">é常使"
-"ç¨ Linux å
æ ¸</a>ã"
+"GNU is <a href=\"/gnu/gnu-linux-faq.html\">often used with a kernel called "
+"Linux</a>, and here is a <a href=\"/distros/free-distros.html\">list of "
+"ready-to-install GNU/Linux distributions</a> which are entirely free "
+"software. <a href=\"/software/hurd/hurd.html\">The Hurd, GNU's kernel</a>, "
+"is actively developed, but is still some way from being ready for daily use."
+msgstr ""
-# type: Content of: <div><div><p>
+# type: Content of: <table><tr><td><p>
+#. type: Content of: <div><div><p>
+msgid ""
+"The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
+"the <strong>GNU/Linux operating system</strong>, now used by millions and "
+"sometimes incorrectly called simply “Linux”."
+msgstr ""
+"ç± <a href=\"/gnu/linux-and-gnu.html\">GNU å Linux</a> ç»æç
<strong>GNU/"
+"Linux æä½ç³»ç»</strong>,
ç®åææ°ç¾ä¸ç¨æ·ï¼ä½å®å¸¸å¸¸è¢«é误çç®ç§°ä¸ºâLinuxâã"
+
+# type: Content of: <table><tr><td><p>
+#. type: Content of: <div><div><p>
msgid ""
-"<a href=\"/software/software.html#HowToGetSoftware\">Download GNU now</a>"
+"The name “GNU” is a recursive acronym for “GNU's Not Unix!"
+"”; <a href=\"/pronunciation/pronunciation.html\">it is pronounced "
+"<em>g-noo</em></a>, as one syllable with no vowel sound between the <em>g</"
+"em> and the <em>n</em>."
msgstr ""
-"<a href=\"/software/software.html#HowToGetSoftware\">ç«å³ä¸è½½ GNU
软件</a>"
+"GNU è¿ä¸ªååæ¯ âGNU's Not Unix!â
çéå½é¦åæ¯ç¼©åè¯ãå®çåé³ä¸º <em> g-noo </"
+"em>ï¼ <em>g</em> å <em>n</em>
ä¹é´æ²¡æå
é³ï¼æ以åªæä¸ä¸ªé³èã"
+
+# type: Content of: <ul><li>
+#. type: Content of: <div><div><p>
+#, fuzzy
+msgid "<a href=\"/distros/free-distros.html\">Download GNU now</a>"
+msgstr "<a href=\"/licenses/license-list.html\"> èªç±è½¯ä»¶è®¸å¯è¯ </a>"
# type: Content of: <div><div><h3>
+#. type: Content of: <div><div><div><h4>
msgid "GNUs Flashes"
msgstr "GNU 快讯"
-# type: Content of: <p>
-msgid ""
-"For other news, as well as for items that used to be in this GNUs Flashes "
-"section, see <a href=\"/server/whatsnew.html\">What's New</a> in and about "
-"the GNU Project."
+# type: Content of: <table><tr><td><ul><li>
+#. type: Content of: <div><div><div><p>
+#, fuzzy
+#| msgid "<a href=\"http://planet.gnu.org/\";>planet.gnu.org</a>"
+msgid "For more news, see <a href=\"http://planet.gnu.org/\";>Planet GNU</a>."
+msgstr "<a href=\"http://planet.gnu.org/\";>planet.gnu.org</a>"
+
+#. type: Content of: <div><div><div><h4>
+msgid "GNU Guile"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+msgid ""
+"<a href=\"http://www.gnu.org/software/guile/\";>GNU Guile</a> is the official "
+"extension language for the GNU Operating System. Version 2.0 was released "
+"February 16, 2011 with a <a href=\"http://www.gnu.org/software/guile/news.";
+"html\">wealth of new features.</a> Its compiler infrastructure, libraries, "
+"and dynamic programming environment make it a great language to write "
+"applications in. <a href=\"http://www.gnu.org/software/guile/community.html";
+"\">Join the community now!</a>"
msgstr ""
-"æ³è¦äºè§£å
¶å®çæ°é»ï¼ä»¥åæ©å
å¨æ¬å¿«è®¯ä¸åºç°è¿çæ¡ç®ï¼è¯·è§å¨
GNU å·¥ç¨ä¸æä¸å
¶æ"
-"å
³ç <a href=\"/server/whatsnew.html\">ææ°æ¶æ¯</a>ã "
# type: Attribute 'title' of: <link>
+#. type: Content of: <div><div><div><h4>
msgid "GNUstep"
msgstr "GNUstep"
# type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><p>
msgid ""
"<a href=\"http://www.gnustep.org/\";>GNUstep</a> is a fully-functional object-"
"oriented development environment. We need developers to write and port "
@@ -177,30 +233,13 @@
"å¢ãæ们éè¦å¼å人å为GNUstepç¼åå移æ¤åºç¨ç¨åºï¼ä»¥ä¾¿ä¸ºç¨æ·æä¾æ´å¥½çå¼åä½"
"éªã"
-# type: Content of: <table><tr><td><p>
-msgid ""
-"The combination of <a href=\"/gnu/linux-and-gnu.html\">GNU and Linux</a> is "
-"the <strong>GNU/Linux operating system</strong>, now used by millions and "
-"sometimes incorrectly called simply “Linux”."
-msgstr ""
-"ç± <a href=\"/gnu/linux-and-gnu.html\">GNU å Linux</a> ç»æç
<strong>GNU/"
-"Linux æä½ç³»ç»</strong>,
ç®åææ°ç¾ä¸ç¨æ·ï¼ä½å®å¸¸å¸¸è¢«é误çç®ç§°ä¸ºâLinuxâã"
-
-# type: Content of: <table><tr><td><p>
-msgid ""
-"The name “GNU” is a recursive acronym for “GNU's Not Unix!"
-"”; <a href=\"/pronunciation/pronunciation.html\">it is pronounced "
-"<em>g-noo</em></a>, as one syllable with no vowel sound between the <em>g</"
-"em> and the <em>n</em>."
-msgstr ""
-"GNU è¿ä¸ªååæ¯ âGNU's Not Unix!â
çéå½é¦åæ¯ç¼©åè¯ãå®çåé³ä¸º <em> g-noo </"
-"em>ï¼ <em>g</em> å <em>n</em>
ä¹é´æ²¡æå
é³ï¼æ以åªæä¸ä¸ªé³èã"
-
# type: Content of: <h3>
+#. type: Content of: <div><div><h2>
msgid "What is Free Software?"
msgstr "èªç±è½¯ä»¶æ¯ä»ä¹ï¼"
# type: Content of: <p>
+#. type: Content of: <div><div><p>
msgid ""
"“<a href=\"/philosophy/free-sw.html\">Free software</a>” is a "
"matter of liberty, not price. To understand the concept, you should think "
@@ -212,6 +251,7 @@
"è´¹âã"
# type: Content of: <p>
+#. type: Content of: <div><div><p>
msgid ""
"<strong>Free software is a matter of the users' freedom to run, copy, "
"distribute, study, change and improve the software.</strong> More precisely, "
@@ -221,10 +261,12 @@
"strong> æ´ç²¾ç¡®å°è¯´ï¼èªç±è½¯ä»¶èµäºè½¯ä»¶ä½¿ç¨è
åç§èªç±ï¼"
# type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
msgid "The freedom to run the program, for any purpose (freedom 0)."
msgstr "ä¸è®ºç®ç为ä½ï¼æè¿è¡è¯¥è½¯ä»¶çèªç±ï¼èªç±ä¹é¶ï¼ã"
# type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"The freedom to study how the program works, and adapt it to your needs "
"(freedom 1). Access to the source code is a precondition for this."
@@ -233,11 +275,13 @@
"为达ææ¤ç®çä¹åæã "
# type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"The freedom to redistribute copies so you can help your neighbor (freedom 2)."
msgstr
"æéæ°åå¸æ·è´çèªç±ï¼è¿æ ·ä½ å¯ä»¥åæ¤æ¥æ¦äº²ç¦é»ï¼èªç±ä¹äºï¼ã"
# type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"The freedom to improve the program, and release your improvements to the "
"public, so that the whole community benefits (freedom 3). Access to the "
@@ -247,10 +291,12 @@
"å¾è¯¥è½¯ä»¶æºç 为达ææ¤ç®çä¹åæã"
# type: Content of: <div><div><h3>
+#. type: Content of: <div><div><h2>
msgid "Take Action"
msgstr "éåè¡å¨"
# type: Content of: <div><div><ul><li><ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"<strong><a href=\"http://www.fsf.org/campaigns\";>Support current FSF "
"campaigns</a></strong>."
@@ -259,6 +305,7 @@
"a></strong>."
# type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"<strong>Watch and share this movie:</strong> <a href=\"http://";
"patentabsurdity.com\">Patent Absurdity</a>—made possible by <a href="
@@ -270,6 +317,7 @@
"<a href=\"http://www.fsf.org/associate/\";>èªç±è½¯ä»¶åºéä¼åä¼å</a>
å¶ä½ã"
# type: Content of: <table><tr><td><ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"<strong>Fight against software patents:</strong> <a href=\"http://www.";
"endsoftpatents.org\">worldwide</a>, <a href=\"/server/takeaction.html#swpat"
@@ -279,6 +327,7 @@
"åå°</a>ï¼<a href=\"/server/takeaction.html#swpat\">欧洲</a>ã"
# type: Content of: <ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"<strong><a href=\"/server/takeaction.html#wipochange\">Call on WIPO</a></"
"strong> to change its name and mission."
@@ -287,60 +336,96 @@
"æ¹åå
¶åååä»»å¡."
# type: Content of: <div><div><ul><li>
+#. type: Content of: <div><div><ul><li>
msgid ""
"<a href=\"/server/takeaction.html#directory\">Add to the Free Software "
"Directory</a>."
msgstr "<a
href=\"/server/takeaction.html#directory\">å å
¥èªç±è½¯ä»¶ç®å½</a>ã"
# type: Content of: <div><div><p>
+#. type: Content of: <div><div><ul><li>
msgid "<a href=\"/server/takeaction.html\">More action items.</a>"
msgstr "<a href=\"/server/takeaction.html\">å
¶å®è¡å¨äºé¡¹</a>"
# type: Content of: <div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "<strong>Can you contribute to any of these <a href=\"http://www.fsf.org/";
+#| "campaigns/priority-projects/\">High Priority Projects</a>?</strong> GNU "
+#| "PDF, Gnash, coreboot, free distributions of GNU/Linux, GNU Octave, "
+#| "drivers for network routers, and reversible debugging in GDB, and also "
+#| "free software replacements for Skype, OpenDWG libraries, RARv3, Oracle "
+#| "Forms, and automatic transcription."
msgid ""
"<strong>Can you contribute to any of these <a href=\"http://www.fsf.org/";
"campaigns/priority-projects/\">High Priority Projects</a>?</strong> GNU PDF, "
"Gnash, coreboot, free distributions of GNU/Linux, GNU Octave, drivers for "
-"network routers, and reversible debugging in GDB, and also free software "
-"replacements for Skype, OpenDWG libraries, RARv3, Oracle Forms, and "
-"automatic transcription."
-msgstr "<strong>æ¨è½ä¸ºè¿äº <a
href=\"http://www.fsf.org/campaigns/priority-projects/\";>é«ä¼å
级ç项ç®</a>ååºè´¡ç®ç ï¼</strong>
GNU PDF, Gnash, coreboot, èªç±ç GNU/Linux åè¡ç, GNU Octave,
ç½ç»è·¯ç±å¨é©±å¨åGDBçååè°è¯ï¼è¿æ Skype, OpenDWG åº, RARv3
å Oracle Forms çèªç±è½¯ä»¶æ¿ä»£åã"
+"network routers, reversible debugging in GDB, automatic transcription, "
+"PowerVR drivers, and also free software replacements for Skype, OpenDWG "
+"libraries, RARv3, and Oracle Forms."
+msgstr ""
+"<strong>æ¨è½ä¸ºè¿äº <a
href=\"http://www.fsf.org/campaigns/priority-projects/";
+"\">é«ä¼å
级ç项ç®</a>ååºè´¡ç®ç ï¼</strong> GNU PDF, Gnash,
coreboot, èªç±ç "
+"GNU/Linux åè¡ç, GNU Octave,
ç½ç»è·¯ç±å¨é©±å¨åGDBçååè°è¯ï¼è¿æ Skype, "
+"OpenDWG åº, RARv3 å Oracle Forms çèªç±è½¯ä»¶æ¿ä»£åã"
# type: Content of: <table><tr><td><ul><li>
+#. type: Content of: <div><p>
#, fuzzy
msgid ""
"<strong>Can you help take over an <a href=\"/server/takeaction.html#unmaint"
"\">unmaintained GNU package</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/fontutils/"
-"\">fontutils</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/"
+"\"/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/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 looking "
+"for maintainers. <a href=\"/server/takeaction.html#unmaint\">More "
+"information</a>."
+msgstr ""
+"<strong>ä½ è½å¸®å©æ¥æä¸å <a
href=\"http://www.gnu.org/server/takeaction.";
+"html#unmaint\">失å»ç»´æ¤çGNU软件å
</a> åï¼</strong> <a
href=\"/software/"
+"alive/\">alive</a>, <a href=\"/software/dr-geo/\">dr-geo</a>, <a href=\"/"
+"software/fontutils/\">fontutils</a>, <a href=\"/software/gift/\">gift</a>, "
+"<a href=\"/software/gleem/\">gleem</a>, <a href=\"/software/goldwater/"
"\">goldwater</a>, <a href=\"/software/halifax/\">halifax</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 looking for maintainers. <a href="
-"\"/server/takeaction.html#unmaint\">More information</a>."
-msgstr "<strong>ä½ è½å¸®å©æ¥æä¸å <a
href=\"http://www.gnu.org/server/takeaction.html#unmaint\";>失å»ç»´æ¤çGNU软件å
</a>
åï¼</strong> <a href=\"/software/alive/\">alive</a>, <a
href=\"/software/dr-geo/\">dr-geo</a>, <a
href=\"/software/fontutils/\">fontutils</a>, <a
href=\"/software/gift/\">gift</a>, <a href=\"/software/gleem/\">gleem</a>, <a
href=\"/software/goldwater/\">goldwater</a>, <a
href=\"/software/halifax/\">halifax</a>, <a
href=\"/software/pgccfd/\">pgccfd</a>, <a
href=\"/software/polyxmass/\">polyxmass</a>, <a
href=\"/software/quickthreads/\">quickthreads</a>, <a
href=\"/software/sather/\">sather</a>, <a
href=\"/software/snakecharmer/\">snakecharmer</a> and <a
href=\"/software/vmslib/\">vmslib</a> è¿äºé¡¹ç®æ£å¨å¯»æ¾ç»´æ¤äººã <a
href=\"/server/takeaction.html#unmaint\">æ´å¤ä¿¡æ¯</a>ã"
+"software/pgccfd/\">pgccfd</a>, <a href=\"/software/polyxmass/\">polyxmass</"
+"a>, <a href=\"/software/quickthreads/\">quickthreads</a>, <a href=\"/"
+"software/sather/\">sather</a>, <a href=\"/software/snakecharmer/"
+"\">snakecharmer</a> and <a href=\"/software/vmslib/\">vmslib</a>
è¿äºé¡¹ç®æ£å¨"
+"寻æ¾ç»´æ¤äººã <a
href=\"/server/takeaction.html#unmaint\">æ´å¤ä¿¡æ¯</a>ã"
# type: Content of: <div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
+#. type: Content of: <div>
msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
msgstr " "
# type: Content of: <div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
+#| "2005, 2006, 2007, 2008, 2009, 2010 <a href=\"http://www.fsf.org\";>Free "
+#| "Software Foundation</a>, Inc."
msgid ""
"Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
-"2006, 2007, 2008, 2009, 2010 <a href=\"http://www.fsf.org\";>Free Software "
-"Foundation</a>, Inc."
+"2006, 2007, 2008, 2009, 2010, 2011 <a href=\"http://www.fsf.org\";>Free "
+"Software Foundation</a>, Inc."
msgstr ""
"çæææ © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, "
"2006, 2007, 2008, 2009, 2010 <a
href=\"http://www.fsf.org\";>èªç±è½¯ä»¶åºéä¼</"
"a>"
# type: Content of: <table><tr><td><p>
+#. type: Content of: <div><p>
msgid ""
"The <a href=\"http://www.fsf.org/\";>FSF</a> also has sister organizations in "
"<a href=\"http://www.fsfe.org\";>Europe</a>, <a href=\"http://www.fsfla.org/";
@@ -351,6 +436,7 @@
"\"http://fsf.org.in/\";> å°åº¦ </a> ä¹æå§å¦¹ç»ç»ã"
# type: Content of: <div><p>
+#. type: Content of: <div><p>
msgid ""
"Verbatim copying and distribution of this entire article are permitted "
"worldwide, without royalty, in any medium, provided this notice, and the "
@@ -361,15 +447,18 @@
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
+#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
msgstr "<b>ç¿»è¯</b>: åæå®ï¼æ½æ°¸ä¹ï¼æå¡å¸ 2007, 2008, 2009,
2010"
# type: Content of: <div><p>
#. timestamp start
+#. type: Content of: <div><p>
msgid "Updated:"
msgstr "æåæ´æ°ï¼"
# type: Content of: <div><h4>
+#. type: Content of: <div><h4>
msgid ""
"<a href=\"/server/standards/README.translations.html\">Translations</a> of "
"this page"
@@ -378,6 +467,40 @@
# type: Content of: <div><ul><li>
#~ msgid ""
+#~ "<a href=\"http://yourfreedom.hmg.gov.uk/repealing-unnecessary-laws/";
+#~ "digital-economy-act\">UK citizens: help repeal the Digital Economy Act</a>"
+#~ msgstr ""
+#~ "<a href=\"http://yourfreedom.hmg.gov.uk/repealing-unnecessary-laws/";
+#~
"digital-economy-act\">è±å½å
¬æ°ï¼åä¸æ¤æ¶æ°åç»æµæ³æ¡è¡å¨</a>"
+
+# type: Content of: <div><div><p>
+#~ msgid ""
+#~ "<a href=\"/software/hurd/\">The Hurd, GNU's kernel</a>, is actively "
+#~ "developed, but is still some way from being ready for daily use, so GNU "
+#~ "is <a href=\"/gnu/gnu-linux-faq.html\">often used with a kernel called "
+#~ "Linux</a>."
+#~ msgstr ""
+#~ "<a href=\"/software/hurd/\">GNUçå
æ ¸ - Hurd</a>
æ£å¨ç§¯æçå¼åä¸ï¼ä½ä»æª"
+#~ "è¾¾å°å¯ä»¥æ¥å¸¸ä½¿ç¨çç¨åº¦ï¼æ以ç®å GNU <a
href=\"/gnu/gnu-linux-faq.html\">"
+#~ "éå¸¸ä½¿ç¨ Linux å
æ ¸</a>ã"
+
+# type: Content of: <div><div><p>
+#~ msgid ""
+#~ "<a href=\"/software/software.html#HowToGetSoftware\">Download GNU now</a>"
+#~ msgstr ""
+#~ "<a href=\"/software/software.html#HowToGetSoftware\">ç«å³ä¸è½½ GNU
软件</a>"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "For other news, as well as for items that used to be in this GNUs Flashes "
+#~ "section, see <a href=\"/server/whatsnew.html\">What's New</a> in and "
+#~ "about the GNU Project."
+#~ msgstr ""
+#~
"æ³è¦äºè§£å
¶å®çæ°é»ï¼ä»¥åæ©å
å¨æ¬å¿«è®¯ä¸åºç°è¿çæ¡ç®ï¼è¯·è§å¨
GNU å·¥ç¨ä¸æä¸"
+#~ "å
¶æå
³ç <a href=\"/server/whatsnew.html\">ææ°æ¶æ¯</a>ã "
+
+# type: Content of: <div><ul><li>
+#~ msgid ""
#~ "<a href=\"/accessibility/accessibility.html\">Read the GNU Accessibility "
#~ "Statement</a>"
#~ msgstr ""
@@ -612,7 +735,8 @@
#, fuzzy
#~ msgid ""
#~ "<a href=\"http://www.fsf.org/campaigns/priority.html#pdf\";>GNU PDF</a>."
-#~ msgstr "<a href=\"http://www.fsf.org/campaigns/priority.html#pdf\";> Gnash
PDF </a>"
+#~ msgstr ""
+#~ "<a href=\"http://www.fsf.org/campaigns/priority.html#pdf\";> Gnash PDF </a>"
# type: Content of: <table><tr><td><h2>
#~ msgid "Get Involved"
@@ -677,11 +801,6 @@
#~ msgid "Other GNU resources"
#~ msgstr "å
¶å® GNU èµæº"
-# type: Content of: <ul><li>
-#, fuzzy
-#~ msgid "<a href=\"/distros/free-distros.html\">Free GNU/Linux Distros</a>"
-#~ msgstr "<a href=\"/licenses/license-list.html\"> èªç±è½¯ä»¶è®¸å¯è¯ </a>"
-
# type: Content of: <table><tr><td><ul><li>
#~ msgid "<a href=\"http://directory.fsf.org/GNU/\";>GNU Packages</a>"
#~ msgstr "<a href=\"http://directory.fsf.org/GNU/\";> GNU 软件å
</a>"
@@ -751,10 +870,6 @@
#~ msgid "GNU people and fun"
#~ msgstr "GNU 人ç©ä¸è¶£é»"
-# type: Content of: <table><tr><td><ul><li>
-#~ msgid "<a href=\"http://planet.gnu.org/\";>planet.gnu.org</a>"
-#~ msgstr "<a href=\"http://planet.gnu.org/\";>planet.gnu.org</a>"
-
# type: Content of: <ul><li>
#~ msgid "<a href=\"/people/people.html\">GNU's Who</a>"
#~ msgstr "<a href=\"/people/people.html\"> æ们çæå </a>"
Index: server/body-include-2.zh-cn.html
===================================================================
RCS file: /web/www/www/server/body-include-2.zh-cn.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/body-include-2.zh-cn.html 15 Dec 2010 01:28:42 -0000 1.13
+++ server/body-include-2.zh-cn.html 1 May 2011 16:25:58 -0000 1.14
@@ -8,12 +8,12 @@
<div id="fssbox">
- <h4>Sign up for the <em>Free Software Supporter</em></h4>
- <p>A monthly update on GNU and the FSF</p>
+ <h4>订é
<em>èªç±è½¯ä»¶æ¯æè
</em></h4>
+ <p>å
³æ³¨GNUåFSF; æ¯ææ´æ°</p>
<form action="http://lists.fsf.org/mailman/subscribe/info-fsf";
method="post">
- <p><input type="text" id="frmEmail" name="email" size="15"
maxlength="80"
-value="y...@example.com" onfocus="this.value=''" /> <input
-type="submit" value="Ok" /></p>
+ <p><p><input type="text" id="frmEmail" name="email"
size="15"maxlength="80"
+value="y...@example.com" onfocus="this.value=''"> <input type="submit"
+value="Ok"></p></p>
</form>
</div>
</div>
@@ -24,22 +24,22 @@
<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"
-id="phrase" type="text" size="18" accesskey="s" value="Why GNU/Linux?"
-onfocus="this.value=''" /> <input type="submit" value="Search" /></div>
+ <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="æç´¢" /></div>
<!-- unnamed label -->
</form>
</div>
<!-- /searcher -->
<ul>
- <li id="tabPhilosophy"><a href=
"/philosophy/philosophy.html">Philosophy</a></li>
+ <li id="tabPhilosophy"><a
href="/philosophy/philosophy.zh-cn.html">å²å¦</a></li>
<li id="tabLicenses"><a href="/licenses/licenses.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>
- <li id="joinfsftab"><a
-href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join the FSF!</a></li>
+ <li id="joinfsftab"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>ä»å¤©å°±å å
¥
+FSFï¼</a></li>
</ul>
</div>
