www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/gnu/po why-programs-should-be-shared.zh-cn.po


From: Wensheng XIE
Subject: www/gnu/po why-programs-should-be-shared.zh-cn.po
Date: Mon, 8 Nov 2021 02:44:59 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     Wensheng XIE <wxie>     21/11/08 02:44:59

Modified files:
        gnu/po         : why-programs-should-be-shared.zh-cn.po 

Log message:
        zh_CN: update translation

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-programs-should-be-shared.zh-cn.po?cvsroot=www&r1=1.3&r2=1.4

Patches:
Index: why-programs-should-be-shared.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/why-programs-should-be-shared.zh-cn.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- why-programs-should-be-shared.zh-cn.po      6 Nov 2021 20:30:31 -0000       
1.3
+++ why-programs-should-be-shared.zh-cn.po      8 Nov 2021 07:44:59 -0000       
1.4
@@ -1,13 +1,18 @@
 # Simplified Chinese translation of 
https://www.gnu.org/gnu/why-programs-should-be-shared.html
-# Copyright (C) 2018 Free Software Foundation, Inc.
+# Copyright (C) 2021 Free Software Foundation, Inc.
 # This file is distributed under the same license as the original article.
-# Wensheng Xie <wxie@member.fsf.org>, 2018.
+# Wensheng Xie <wxie@member.fsf.org>, 2018, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: why-programs-should-be-shared.html\n"
+<<<<<<< why-programs-should-be-shared.zh-cn.po
+"POT-Creation-Date: 2021-11-06 20:25+0000\n"
+"PO-Revision-Date: 2021-11-08 15:40+0800\n"
+=======
 "POT-Creation-Date: 2021-11-06 20:25+0000\n"
 "PO-Revision-Date: 2018-07-21 12:43+0800\n"
+>>>>>>> 1.3
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
 "Language: zh_CN\n"
@@ -24,13 +29,28 @@
 msgid "Why Programs Should be Shared"
 msgstr "为什么应该分享软件"
 
+<<<<<<< why-programs-should-be-shared.zh-cn.po
+# type: Content of: <p>
+#. type: Content of: <div><address>
+msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
+msgstr "<a href=\"https://www.stallman.org/\";>理查德·斯托曼</a> 著"
+=======
 # type: Content of: <p>
 #. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>理查德·斯托曼</a> 著"
+>>>>>>> 1.3
 
+<<<<<<< why-programs-should-be-shared.zh-cn.po
+#. type: Content of: <div><div><p>
+msgid ""
+"Editor's note: This text was found in a file dated May 1983, though it is "
+"not clear whether it was written then or earlier.  In May 1983 Richard "
+"Stallman was privately considering plans to develop a free operating system, "
+"but he may not yet have decided to make it a Unix-like system rather than "
+=======
 #. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
@@ -44,13 +64,21 @@
 "not clear whether it was written then or earlier.  In May 1983 Richard "
 "Stallman was privately considering plans to develop a free operating system, "
 "but he may not yet have decided to make it a Unix-like system rather than "
+>>>>>>> 1.3
 "something like the MIT Lisp Machine."
 msgstr ""
-"Richard 
Stallman撰写了本文,它在一个日期为1983年5月的文件中被发现,现在我们不"
-"清
楚本文是当时写的还是更早时写的。在1983年5月,他正在私下计划开发一个自由的操"
-"作系统,不过他可能还没有决定是做一个类似Unix的系统,还是做一个类似MIT
 Lisp "
-"Machine的操作系统。"
+"编者
注:本文在一个日期为1983å¹´5月的文件中被发现,现在我们不æ¸
…楚本文是当时写的"
+"还是更早时写的。在1983年5月,Richard Stallman 
正在私下计划开发一个自由的操作"
+"系统,不过他可能还没有决定是做一个类似 Unix 
的系统,还是做一个类似 MIT Lisp "
+"Machine 的操作系统。"
 
+<<<<<<< why-programs-should-be-shared.zh-cn.po
+#. type: Content of: <div><div><p>
+msgid ""
+"He had not yet conceptually distinguished the two meanings of &ldquo;"
+"free&rdquo;; this message is formulated in terms of gratis copies, but take "
+"for granted that this means users also have freedom."
+=======
 #. type: Content of: <div><div><p>
 #, fuzzy
 #| msgid ""
@@ -61,9 +89,10 @@
 "He had not yet conceptually distinguished the two meanings of &ldquo;"
 "free&rdquo;; this message is formulated in terms of gratis copies, but take "
 "for granted that this means users also have freedom."
+>>>>>>> 1.3
 msgstr ""
-"他也还没有在概念上区分&ldquo;free&rdquo;的两种含义;本文按ç
…§å…è´¹æ‹·è´æ¥å™è¿°ï¼Œ"
-"但是这当然意味着用户也拥有自由。"
+"他也还没有在概念上区分 &ldquo;free&rdquo; 
的两种含义;本文按照免费拷贝来叙"
+"述,但是这当然意味着用户也拥有自由。"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -182,14 +211,27 @@
 "\">Translations README</a> for information on coordinating and contributing "
 "translations of this article."
 msgstr ""
+<<<<<<< why-programs-should-be-shared.zh-cn.po
+"我们尽最大努力来提供精准和高质量的翻译,但难å…
ä¼šå­˜åœ¨é”™è¯¯å’Œä¸è¶³ã€‚如果您在这方"
+"面有评论或一般性的建议,请发送至 <a 
href=\"mailto:web-translators@gnu.org";
+"\">&lt;web-translators@gnu.org&gt;</a>。</p><p>å…
³äºŽè¿›è¡Œåè°ƒä¸Žæäº¤ç¿»è¯‘的更多信"
+"息参见 <a href=\"/server/standards/README.translations.html\">《译者
指南》</"
+"a>。"
+=======
 "请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
 "解有关协调和提交文章翻译的信息。"
+>>>>>>> 1.3
 
 #. type: Content of: <div><p>
+<<<<<<< why-programs-should-be-shared.zh-cn.po
+msgid "Copyright &copy; 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2015, 2021 Free Software Foundation, Inc."
+=======
 #, fuzzy
 #| msgid "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
 msgid "Copyright &copy; 2015, 2021 Free Software Foundation, Inc."
 msgstr "Copyright &copy; 2015, 2016 Free Software Foundation, Inc."
+>>>>>>> 1.3
 
 #. type: Content of: <div><p>
 msgid ""
@@ -206,7 +248,7 @@
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 "<b>翻译团队</b>:<a rel=\"team\" 
href=\"https://savannah.gnu.org/projects/";
-"www-zh-cn/\">&lt;CTT&gt;</a>,2018。"
+"www-zh-cn/\">&lt;CTT&gt;</a>,2018,2021。"
 
 #.  timestamp start 
 #. type: Content of: <div><p>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]