CVSROOT: /web/www
Module name: www
Changes by: DENG Nan <monnand> 12/02/16 20:03:49
Modified files:
licenses/po : licenses.zh-cn.po
po : home.zh-cn.po
Log message:
bug fixing and unfuzzy
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-cn.po?cvsroot=www&r1=1.156&r2=1.157
Patches:
Index: licenses/po/licenses.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/licenses.zh-cn.po 16 Feb 2012 09:31:30 -0000 1.3
+++ licenses/po/licenses.zh-cn.po 16 Feb 2012 20:02:56 -0000 1.4
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: licenses.html\n"
"POT-Creation-Date: 2012-02-15 12:25-0500\n"
-"PO-Revision-Date: 2012-02-16 00:34-0500\n"
+"PO-Revision-Date: 2012-02-16 15:00-0500\n"
"Last-Translator: Li Fanxi <lifa...@freemindworld.com>\n"
"Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n"
"MIME-Version: 1.0\n"
@@ -241,10 +241,6 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">Older versions "
-#| "of the GNU LGPL</a>"
msgid ""
"<a href=\"/licenses/old-licenses/old-licenses.html#LGPL\">Older versions of "
"the GNU LGPL</a>"
Index: po/home.zh-cn.po
===================================================================
RCS file: /web/www/www/po/home.zh-cn.po,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- po/home.zh-cn.po 16 Feb 2012 07:05:16 -0000 1.156
+++ po/home.zh-cn.po 16 Feb 2012 20:03:19 -0000 1.157
@@ -8,7 +8,11 @@
"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"
@@ -99,6 +103,17 @@
# 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 “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 ""
+"<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/"
@@ -114,6 +129,7 @@
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> é³ã"
@@ -393,11 +409,6 @@
# 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, 2011 <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, 2011, 2012 <a href=\"http://www.fsf.org\";>Free "
