CVSROOT: /web/www Module name: www Changes by: Pavel Kharitonov <ineiev> 12/02/16 07:29:37
Modified files: copyleft/po : copyleft.zh-cn.po doc/po : doc.zh-cn.po licenses/po : licenses.zh-cn.po philosophy/po : free-doc.zh-cn.po open-source-misses-the-point.zh-cn.po Log message: Validation fixes. CVSWeb URLs: http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/po/copyleft.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2 http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/doc.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2 http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2 http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-cn.po?cvsroot=www&r1=1.4&r2=1.5 http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8 Patches: Index: copyleft/po/copyleft.zh-cn.po =================================================================== RCS file: /web/www/www/copyleft/po/copyleft.zh-cn.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- copyleft/po/copyleft.zh-cn.po 16 Feb 2012 06:07:59 -0000 1.1 +++ copyleft/po/copyleft.zh-cn.po 16 Feb 2012 07:28:51 -0000 1.2 @@ -172,8 +172,8 @@ "gpl.html\">GNU éç¨å ¬å ±è®¸å¯è¯ (HTMLæ ¼å¼</a>ï¼ <a href=\"/copyleft/gpl.txt\">" "纯ææ¬</a>ï¼ <a href=\"/copyleft/gpl.texi\">Texinfo</a> æ ¼å¼)ã GNU éç¨å ¬å ±" "许å¯è¯é常被ç®å为 GNU GPL ãè¿éæä¸ä¸ªæå ³å®ç<a href=\"/copyleft/gpl-faq." -"html\">常è§é®é¢</a> 页é¢ãä½ ä¹å¯ä»¥åè <a href=\"/copyleft/why-assign.html\" " -"target=\"_blank\">为ä»ä¹FSFä»è½¯ä»¶ä½è å¤è·å¾çæ转让</a>ã" +"html\">常è§é®é¢</a> 页é¢ãä½ ä¹å¯ä»¥åè <a href=\"/copyleft/why-assign.html\">" +"为ä»ä¹FSFä»è½¯ä»¶ä½è å¤è·å¾çæ转让</a>ã" # type: Content of: <p> #. type: Content of: <p> @@ -270,7 +270,7 @@ "å¦æä½ å¸æå¯¹ä½ æ°åçæåéè¿åºç¨GNU FDLä¿ç Copyleftï¼è¯·åèFDL <a href=\"/" "copyleft/fdl.html#SEC4\">ç»å°¾é¨å</a> çå 容以å <a href=\"/copyleft/fdl-" "howto.html\">GFDLæå</a> 页é¢ä¸çå 容ãä¸GNU GPLä¸æ ·ï¼ä½ å¿ é¡»ä½¿ç¨æ´ä¸ªè®¸å¯è¯ï¼" -"èä¸è½æ¯å ¶ä¸çä¸é¨åã</p>" +"èä¸è½æ¯å ¶ä¸çä¸é¨åã" # type: Content of: <div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes. Index: doc/po/doc.zh-cn.po =================================================================== RCS file: /web/www/www/doc/po/doc.zh-cn.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- doc/po/doc.zh-cn.po 16 Feb 2012 06:08:06 -0000 1.1 +++ doc/po/doc.zh-cn.po 16 Feb 2012 07:29:14 -0000 1.2 @@ -121,7 +121,7 @@ "and other ways to help, <a href=\"/help/help.html#helpgnu\">click here</a>." msgstr "" "请帮å©æ们æ°åæ´å¤çææ¡£ï¼è¿æ¯å¯¹èªç±è½¯ä»¶è¿å¨æéè¦çè´¡ç®æ¹å¼ä¹ä¸ã请 <a href=" -"\\\"/help/help.html#helpgnu\\\">ç¹å»æ¤å¤</a> æ¥çç»èåå ¶å®ç¸å ³ä¿¡æ¯ã" +"\"/help/help.html#helpgnu\">ç¹å»æ¤å¤</a> æ¥çç»èåå ¶å®ç¸å ³ä¿¡æ¯ã" # type: Content of: <p> #. type: Content of: <p> @@ -159,8 +159,8 @@ "Please send broken links and other corrections or suggestions to <a href=" "\"mailto:webmast...@gnu.org\"><webmast...@gnu.org></a>." msgstr "" -"åç°ä»»ä½é误åé¾æ¥æå ¶å®éè¦æ´æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ " -"<webmast...@gnu.org>ã" +"åç°ä»»ä½é误åé¾æ¥æå ¶å®éè¦æ´æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a href=" +"\"mailto:webmast...@gnu.org\"><webmast...@gnu.org></a>ã" # type: Content of: <div><p> #. type: Content of: <div><p> @@ -189,7 +189,7 @@ msgstr "" "æ¬é¡µé¢éç¨ <a rel=\"license\" href=\"http://creativecommons.org/licenses/by-" "nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States " -"License</a> 许å¯è¯ææã<" +"License</a> 许å¯è¯ææã" # type: Content of: <div><div> #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits. Index: licenses/po/licenses.zh-cn.po =================================================================== RCS file: /web/www/www/licenses/po/licenses.zh-cn.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- licenses/po/licenses.zh-cn.po 16 Feb 2012 06:03:52 -0000 1.1 +++ licenses/po/licenses.zh-cn.po 16 Feb 2012 07:29:23 -0000 1.2 @@ -589,7 +589,7 @@ "extended versions of the program to be free software as well." msgstr "" "<a href=\"/copyleft/copyleft.html\"><em>Copyleft</em></a> æ¯ä¸ç§è®©ç¨åºæå ¶å®" -"ä½åä¿æèªç±çéç¨æ¹æ³ï¼å®è¦æ±ææ对Copyleftç¨åºçä¿®æ¹åæ©å±é½ä¿æèªç±ã<" +"ä½åä¿æèªç±çéç¨æ¹æ³ï¼å®è¦æ±ææ对Copyleftç¨åºçä¿®æ¹åæ©å±é½ä¿æèªç±ã" # type: Content of: <p> #. type: Content of: <p> Index: philosophy/po/free-doc.zh-cn.po =================================================================== RCS file: /web/www/www/philosophy/po/free-doc.zh-cn.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- philosophy/po/free-doc.zh-cn.po 16 Feb 2012 06:03:59 -0000 1.4 +++ philosophy/po/free-doc.zh-cn.po 16 Feb 2012 07:29:30 -0000 1.5 @@ -5,13 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: free-doc.html\n" -<<<<<<< free-doc.zh-cn.po "POT-Creation-Date: 2012-01-23 20:25-0500\n" "PO-Revision-Date: 2012-02-15 16:46+0800\n" -======= -"POT-Creation-Date: 2012-01-23 20:25-0500\n" -"PO-Revision-Date: 2011-12-28 13:27-0500\n" ->>>>>>> 1.3 "Last-Translator: Li Fanxi <lifa...@freemindworld.com>\n" "Language-Team: Chinese <www-zh-cn-translat...@gnu.org>\n" "MIME-Version: 1.0\n" @@ -32,7 +27,6 @@ msgid "Why Free Software needs Free Documentation" msgstr "为ä»ä¹èªç±è½¯ä»¶éè¦èªç±æå" -<<<<<<< free-doc.zh-cn.po #. type: Content of: <div> msgid "" "<a href=\"http://defectivebydesign.org/ebooks.html\">Join our mailing list " @@ -41,14 +35,6 @@ "<a href=\"http://defectivebydesign.org/ebooks.html\">å ³æ³¨æ们æå ³çµå书å±é©æ§" "çé®ä»¶å表</a> ã" -======= -#. type: Content of: <div> -msgid "" -"<a href=\"http://defectivebydesign.org/ebooks.html\">Join our mailing list " -"about the dangers of eBooks</a>." -msgstr "" - ->>>>>>> 1.3 # type: Content of: <ul><li> #. type: Content of: <ul><li> msgid "<a href=\"/copyleft/fdl.html\">The GNU Free Documentation License</a>" Index: philosophy/po/open-source-misses-the-point.zh-cn.po =================================================================== RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.zh-cn.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- philosophy/po/open-source-misses-the-point.zh-cn.po 16 Feb 2012 06:03:59 -0000 1.7 +++ philosophy/po/open-source-misses-the-point.zh-cn.po 16 Feb 2012 07:29:30 -0000 1.8 @@ -213,7 +213,7 @@ msgstr "" "å¯æçæ¯ï¼å¨è±è¯ä¸ï¼è½æ¿æ¢ Free çè¯é½å¤å°æç¹æ¯ç ãæ们èéäºè®¸å¤å«äººç建" "è®®ï¼ç¶è没æåªä¸ªæ¯å ¶ä»çæ´”æ£ç¡®“ç¹ï¼æ¯å¦è¯´ï¼å¨æäºæ åµä¸ï¼æ³è¯å" -"西ççè¯ä¸ç&rduo;libre”ä¸è¯æ´å¥½ç¹ãå¯æ¯å°åº¦çäººå°±æ ¹æ¬ä¸è®¤è¯è¿ä¸ªè¯ï¼ã" +"西ççè¯ä¸ç“libre”ä¸è¯æ´å¥½ç¹ãå¯æ¯å°åº¦çäººå°±æ ¹æ¬ä¸è®¤è¯è¿ä¸ªè¯ï¼ã" "æ¯ä¸ªå¯è½æ¿ä»£“Free Software”çè¯å¤å°é½ä¼æäºè¯ä¹æ¹é¢çé®é¢—" "è¿æ¾ç¶ä¹å 欓å¼æºè½¯ä»¶”ï¼Open Source Softwareï¼ã" @@ -320,7 +320,7 @@ msgstr "" "å¦å¤ä¸ä¸ªå ³äº“å¼æº”ç误解æ¯ï¼å¼æºè½¯ä»¶æå³ç“ä¸ç¨ GNU GPL 许" "å¯è¯”ãè¿ä¸ªè¯¯è§£å常常çéçå¦å¤ä¸ä¸ªè¯¯è§£ï¼“èªç±è½¯ä»¶å°±æ¯ä½¿ç¨ GPL 许" -"å¯è¯ç软件&rdquolãè¿æ¾ç¶æ¯ææ²äºèªç±è½¯ä»¶åå¼æºè½¯ä»¶ãGNU GPL 许å¯è¯ä¹è¢«è®¤è¯ä¸º" +"å¯è¯ç软件”ãè¿æ¾ç¶æ¯ææ²äºèªç±è½¯ä»¶åå¼æºè½¯ä»¶ãGNU GPL 许å¯è¯ä¹è¢«è®¤è¯ä¸º" "å¼æºè½¯ä»¶è®¸å¯è¯ãå¾å¤å¼æºè½¯ä»¶è®¸å¯è¯ä¹åæ¶æ¯èªç±è½¯ä»¶è®¸å¯è¯ã" #. type: Content of: <p> @@ -591,7 +591,7 @@ msgstr "" "带æä¸ææ件ç软件ï¼åå«æä¸æ软件ç GNU/Linux åè¡çä¹æ以æçåååå±ç空" "é´ï¼å°±æ¯å 为æ们社åºä¸å¤§å¤æ°äººå¹¶æ²¡æåå®èªå·±çèªç±ãè¿å¹¶éå·§åã大å¤æ° GNU/" -"Linux ç¨æ·æ¯è¢«“å¼æº&rldquo;ä¸è¯å¸å¼èæ¥ï¼èå¼æºå没ææç»´æ¤ç¨æ·èªç±ä½ä¸º" +"Linux ç¨æ·æ¯è¢«“å¼æº”ä¸è¯å¸å¼èæ¥ï¼èå¼æºå没ææç»´æ¤ç¨æ·èªç±ä½ä¸º" "å ¶ç®æ ãæ è§èªç±çè¨è®ºå£å£ç¸ä¼ ï¼æ¼ è§èªç±çæ度æ¯æ¯çæ¯ã人人å¦æ¤ï¼äºç¸å½±åã" "è¦æ转è¿æ ·çå±å¿ï¼æ们å¯ä¸è½åçï¼å°±æ¯æ´å¤å°è°è®ºèªç±ï¼èéæå®æç½®ä¸è¾¹ã"