CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 12/02/16 06:59:01
Modified files:
po : home.zh-cn.po
Log message:
Validation fix.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.154&r2=1.155
Patches:
Index: home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- home.zh-cn.po 16 Feb 2012 06:04:05 -0000 1.154
+++ home.zh-cn.po 16 Feb 2012 06:58:03 -0000 1.155
@@ -7,13 +7,8 @@
msgstr ""
"Project-Id-Version: home.shtml\n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< home.zh-cn.po
"POT-Creation-Date: 2012-02-10 20:26-0500\n"
"PO-Revision-Date: 2012-02-15 16:27+0800\n"
-=======
-"POT-Creation-Date: 2012-02-10 20:26-0500\n"
-"PO-Revision-Date: 2011-05-05 17:27+0800\n"
->>>>>>> 1.153
"Last-Translator: Li Fanxi <lifa...@freemindworld.com>\n"
"Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n"
"MIME-Version: 1.0\n"
@@ -77,7 +72,6 @@
#. type: Content of: <div><div><p>
msgid ""
-<<<<<<< home.zh-cn.po
"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 "
@@ -86,13 +80,6 @@
"GNU æ¯ä¸ä¸ªç± <a href=\"/philosophy/free-sw.html\">èªç±è½¯ä»¶</a>
ææçç±» Unix "
"æä½ç³»ç» —
èªç±è½¯ä»¶å°éä½ çèªç±ãä½ å¯ä»¥éæ©å®è£
ä¸ä¸ªå®å
¨ç±èªç±è½¯ä»¶ææ"
"ç <a href=\"/distros/free-distros.html\">åºäº Linux å
æ ¸ç GNU
ç³»ç»</a>ã"
-=======
-"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."
-msgstr ""
->>>>>>> 1.153
# type: Content of: <ul><li>
#. type: Content of: <div><div><p><a>
@@ -109,38 +96,15 @@
msgid "</a>"
msgstr "</a>"
-<<<<<<< home.zh-cn.po
-# type: Content of: <table><tr><td><p>
-=======
# type: Content of: <table><tr><td><p>
#. type: Content of: <div><div><p>
#, fuzzy
#| 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>."
-msgid ""
-"The <a href=\"/gnu/gnu.html\">GNU Project</a> was launched in 1984 to "
-"develop the GNU system. The name “GNU” is a recursive acronym "
-"for “GNU's Not Unix!”. <a href=\"/pronunciation/pronunciation."
-"html\"> \"GNU\" is pronounced <em>g'noo</em></a>, as one syllable, like "
-"saying \"grew\" but replacing the <em>r</em> with <em>n</em>."
-msgstr ""
-"GNU è¿ä¸ªååæ¯ âGNU's Not Unix!â
çéå½é¦åæ¯ç¼©åè¯ãå®çåé³ä¸º <em> g-noo </"
-"em>ï¼ <em>g</em> å <em>n</em>
ä¹é´æ²¡æå
é³ï¼æ以åªæä¸ä¸ªé³èã"
-
-# type: Content of: <div><div><p>
->>>>>>> 1.153
-#. type: Content of: <div><div><p>
-#, fuzzy
-#| 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."
msgid ""
-<<<<<<< home.zh-cn.po
"The <a href=\"/gnu/gnu.html\">GNU Project</a> was launched in 1984 to "
"develop the GNU system. The name “GNU” is a recursive acronym "
"for “GNU's Not Unix!”. <a href=\"/pronunciation/pronunciation."
@@ -151,32 +115,14 @@
"æ´ GNU ç³»ç»ãGNUè¿ä¸ªååæ¯ âGNU's Not Unix!â
çéå½é¦åæ¯ç¼©åè¯ã<a href=\"/"
"pronunciation/pronunciation.html\"> \"GNU\" çåé³ä¸º
<em>g'noo</em></a>ï¼åªæ"
"ä¸ä¸ªé³èï¼åé³å¾å âgrewâï¼ä½éè¦æå
¶ä¸ç <em>r</em>
é³æ¿æ¢ä¸º <em>n</em> é³ã"
-=======
-"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."
-msgstr ""
-"ç±» Unix æä½ç³»ç»éè¿ <a href=\"/software/\">ä¸ç³»å</a>
åºç¨ç¨åºãç³»ç»åºåå¼å"
-"å·¥å
·æ建, 并å ä¸ç¨äºèµæºåé
å硬件管ççå
æ ¸ã"
->>>>>>> 1.153
# type: Content of: <div><div><p>
#. type: Content of: <div><div><p>
msgid ""
-<<<<<<< home.zh-cn.po
"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."
-=======
-"<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>."
->>>>>>> 1.153
msgstr ""
-<<<<<<< home.zh-cn.po
"ç±» Unix
æä½ç³»ç»æ¯ç±ä¸ç³»ååºç¨ç¨åºãç³»ç»åºåå¼åå·¥å
·ææç <a
href=\"/"
"software/\">软件éå</a> ,
并å ä¸ç¨äºèµæºåé
å硬件管ççå
æ ¸ã"
@@ -194,8 +140,6 @@
"href=\"/gnu/linux-and-gnu.html\"> <strong>GNU/Linux
æä½ç³»ç»</strong></a>ãå·²"
"ç»æä¸ç¾ä¸äººå¨ä½¿ç¨
GNU/Linuxï¼ä½ä»ä»¬ä¸çå¾å¤äººæå®è¯¯ç§°ä¸º<a href=\"/gnu/gnu-"
"linux-faq.html\">âLinuxâ</a>ã"
-=======
->>>>>>> 1.153
# type: Content of: <ul><li>
#. type: Content of: <div><div><p>
@@ -495,49 +439,7 @@
msgid "Updated:"
msgstr "æåæ´æ°ï¼"
-<<<<<<< home.zh-cn.po
# type: Content of: <div><ul><li>
-=======
-# type: Content of: <table><tr><td><p>
-#~ msgid ""
-#~ "<a href=\"/gnu/gnu.html\">The GNU Project</a> was launched in 1984 to "
-#~ "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 çæä½ç³»ç» — GNU
æä½ç³»ç»ï¼è¿ä¸ªç³»ç»å
¨é¨ç± <a href=\"/"
-#~ "philosophy/free-sw.html\">èªç±è½¯ä»¶</a>
ææï¼èªç±è½¯ä»¶å
åå°éæ¨çèªç±ã"
-
-#~ msgid ""
-#~ "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 ""
-#~ "ç®åï¼GNU <a href=\"/gnu/gnu-linux-faq.html\">éå¸¸ä½¿ç¨ Linux
å
æ ¸</a>ï¼è¿"
-#~ "éæä¸ä¸ªå®å
¨ç±èªç±è½¯ä»¶ç»æç<a
href=\"/distros/free-distros.html\"> å¯ä»¥ç´"
-#~ "æ¥å®è£
使ç¨ç GNU/Linux åè¡ç</a> å表ã<a
href=\"/software/hurd/\">GNUç"
-#~ "å
æ ¸ - Hurd</a>
æ£å¨ç§¯æçå¼åä¸ï¼ä½ä»æªè¾¾å°å¯ä»¥æ¥å¸¸ä½¿ç¨çç¨åº¦ã"
-
-# 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: <div><div><ul><li><ul><li>
-#, fuzzy
-#~| msgid ""
-#~| "<a href=\"http://www.fsf.org/campaigns/priority.html#coreboot\";> "
-#~| "Coreboot (campaign for a free BIOS)</a>"
->>>>>>> 1.153
#~ msgid ""
#~ "<a href=\"http://ma.aclu.org/site/R?i=GFduzww44T4ttMzabqwBig..\";>Shame on "
#~ "Massachusetts for censoring the Internet</a>"
