www/po home.zh-cn.po

[Jan Owoc]

CVSROOT:        /web/www
Module name:    www
Changes by:     Jan Owoc <jsowoc>       12/02/17 00:27:40

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.157&r2=1.158

Patches:
Index: home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- home.zh-cn.po       16 Feb 2012 20:03:19 -0000      1.157
+++ home.zh-cn.po       17 Feb 2012 00:26:33 -0000      1.158
@@ -8,11 +8,7 @@
 "Project-Id-Version: home.shtml\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-10 20:26-0500\n"
-<<<<<<< home.zh-cn.po
 "PO-Revision-Date: 2012-02-16 15:44+0800\n"
-=======
-"PO-Revision-Date: 2012-02-15 16:27+0800\n"
->>>>>>> 1.156
 "Last-Translator: Li Fanxi <lifa...@freemindworld.com>\n"
 "Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -103,7 +99,6 @@
 
 # type: Content of: <table><tr><td><p>
 #. type: Content of: <div><div><p>
-<<<<<<< home.zh-cn.po
 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 "
@@ -113,23 +108,6 @@
 msgstr ""
 "<a href=\"/gnu/gnu.html\">GNU 工程</a> 
创始于一九八四年，旨在开发一个完整 "
 "GNU 系统。GNU这个名字是 “GNU's Not Unix!” 
的递归首字母缩写词。<a href=\"/"
-=======
-#, 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 ""
-"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 ""
-"<a href=\\\"/gnu/gnu.html\\\">GNU 工程</a> 
创始于一九八四年，旨在开发一个完"
-"整 GNU 系统。GNU这个名字是 “GNU's Not Unix!” 
的递归首字母缩写词。<a href=\"/"
->>>>>>> 1.156
 "pronunciation/pronunciation.html\"> \"GNU\" 的发音为 
<em>g'noo</em></a>，只有"
 "一个音节，发音很像 “grew”，但需要把其中的 <em>r</em> 
音替换为 <em>n</em> 音。"