www/po home.zh-cn.po

[Pavel Kharitonov]

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 <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\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>&mdash;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 "
 "操作系统 &mdash; è‡ªç”±è½¯ä»¶å°Šé‡ä½ çš„è‡ªç”±ã€‚ä½ å¯ä»¥é€‰æ‹©å®‰è£…
一个完全由自由软件构成"
 "的 <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>&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."
-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 &ldquo;GNU&rdquo; is a recursive acronym for &ldquo;GNU's Not "
-#| "Unix!&rdquo;; <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 &ldquo;GNU&rdquo; is a recursive acronym "
-"for &ldquo;GNU's Not Unix!&rdquo;.  <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&mdash;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 &ldquo;GNU&rdquo; is a recursive acronym "
 "for &ldquo;GNU's Not Unix!&rdquo;.  <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>&mdash;"
-#~ "software which respects your freedom."
-#~ msgstr ""
-#~ "<a href=\"/gnu/gnu.html\">GNU 工程</a> 创始于一九å…
«å››å¹´ï¼Œæ—¨åœ¨å¼€å‘一个完整"
-#~ "的类似于 Unix 的操作系统 &mdash; 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 &ldquo;Linux&rdquo;."
-#~ 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>"