[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/gnu/po gnu-linux-faq.zh-cn.po
|
From: |
GNUN |
|
Subject: |
www/gnu/po gnu-linux-faq.zh-cn.po |
|
Date: |
Fri, 6 Apr 2018 05:28:47 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/04/06 05:28:47
Modified files:
gnu/po : gnu-linux-faq.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: gnu-linux-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu-linux-faq.zh-cn.po 6 Apr 2018 09:10:20 -0000 1.1
+++ gnu-linux-faq.zh-cn.po 6 Apr 2018 09:28:47 -0000 1.2
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2018-01-24 12:26+0000\n"
+"POT-Creation-Date: 2018-03-31 00:55+0000\n"
"PO-Revision-Date: 2018-04-06 17:05+0800\n"
"Last-Translator: Wensheng Xie <address@hidden>\n"
"Language-Team: Chinese <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-03-31 00:55+0000\n"
#. type: Content of: <title>
msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
@@ -387,6 +388,12 @@
#. type: Content of: <ul><li>
msgid ""
+"<a href=\"#howmuch\">How much of the GNU system is needed for the system to "
+"be GNU/Linux?</a>"
+msgstr "<a
href=\"#howmuch\">éè¦å¤å°GNUçç³»ç»æè¦å«åGNU/Linuxç³»ç»ï¼</a>"
+
+#. type: Content of: <ul><li>
+msgid ""
"<a href=\"#linuxsyswithoutgnu\">Are there complete Linux systems [sic] "
"without GNU?</a>"
msgstr ""
@@ -394,9 +401,9 @@
#. type: Content of: <ul><li>
msgid ""
-"<a href=\"#howmuch\">How much of the GNU system is needed for the system to "
-"be GNU/Linux?</a>"
-msgstr "<a
href=\"#howmuch\">éè¦å¤å°GNUçç³»ç»æè¦å«åGNU/Linuxç³»ç»ï¼</a>"
+"<a href=\"#usegnulinuxandandroid\">Is it correct to say “using "
+"Linux” if it refers to using GNU/Linux and using Android?</a>"
+msgstr ""
#. type: Content of: <ul><li>
msgid ""
@@ -492,14 +499,6 @@
#. type: Content of: <ul><li>
msgid ""
-"<a href=\"#require\">Shouldn't you put something in the GNU GPL to require "
-"people to call the system “GNU”?</a>"
-msgstr ""
-"<a href=\"#require\">é¾éä¸è½å¨GNU
GPLä¸è¦æ±äººä»¬ç§°è¯¥ç³»ç»ä¸º“GNU”"
-"åï¼</a>"
-
-#. type: Content of: <ul><li>
-msgid ""
"<a href=\"#BSDlicense\">Since you objected to the original BSD license's "
"advertising requirement to give credit to the University of California, "
"isn't it hypocritical to demand credit for the GNU project?</a>"
@@ -509,6 +508,14 @@
#. type: Content of: <ul><li>
msgid ""
+"<a href=\"#require\">Shouldn't you put something in the GNU GPL to require "
+"people to call the system “GNU”?</a>"
+msgstr ""
+"<a href=\"#require\">é¾éä¸è½å¨GNU
GPLä¸è¦æ±äººä»¬ç§°è¯¥ç³»ç»ä¸º“GNU”"
+"åï¼</a>"
+
+#. type: Content of: <ul><li>
+msgid ""
"<a href=\"#deserve\">Since you failed to put something in the GNU GPL to "
"require people to call the system “GNU”, you deserve what "
"happened; why are you complaining now?</a>"
@@ -2304,6 +2311,43 @@
#. type: Content of: <dl><dt>
msgid ""
+"How much of the GNU system is needed for the system to be GNU/Linux? <span "
+"class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
+msgstr ""
+"éè¦å¤å°GNUçç³»ç»æè¦å«åGNU/Linuxç³»ç»ï¼<span
class=\"anchor-reference-id\">"
+"(<a href=\"#howmuch\">#howmuch</a>)</span>"
+
+#. type: Content of: <dl><dd>
+msgid ""
+"“How much” is not a meaningful question because the GNU system "
+"does not have precise boundaries."
+msgstr "“å¤å°”ä¸æ¯ä¸ä¸ªææä¹çé®é¢ï¼å
为GNUç³»ç»å¹¶æ²¡æåç¡®çè¾¹çã"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"GNU is an operating system maintained by a community. It includes far more "
+"than just the GNU software packages (of which we have a specific list), and "
+"people add more packages constantly. Despite these changes, it remains the "
+"GNU system, and adding Linux to that yields GNU/Linux. If you use part of "
+"the GNU system and omit part, there is no meaningful way to say “how "
+"much” you used."
+msgstr ""
+"GNUæ¯ä¸ä¸ªç±ç¤¾åºç»´æ¤çæä½ç³»ç»ãå®å
å«çå
容è¿è¿å¤äºä»
ä»
æ¯GNU软件å
ï¼å¯¹æ¤æ们"
+"æä¸ä¸ªå表ï¼ï¼å¹¶ä¸äººä»¬ä¸ç´å¨æ·»å æ´å¤çå
ãé¤äºè¿äºæ´æ¹ï¼å®è¿æ¯GNUç³»ç»ï¼å ä¸"
+"Linux就产çäºGNU/Linuxãå¦æä½
使ç¨äºä¸é¨åGNUç³»ç»ï¼é£ä¹è¯´ä½ ç¨äº“å¤å°"
+"”并没æä»ä¹æä¹ã"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"If we look at the level of packages, Linux is one important package in the "
+"GNU/Linux system. The inclusion of one important GNU package is enough to "
+"justify our request for equal mention."
+msgstr ""
+"å¦ææ们ççå
ç级å«ï¼Linuxæ¯GNU/Linuxç³»ç»çä¸ä¸ªéè¦çå
ãå
å«ä¸ä¸ªéè¦çGNUå
"
+"å·²ç»è¶³å¤æ们è¦æ±å¨å称ä¸å¹³ç对å¾
äºã"
+
+#. type: Content of: <dl><dt>
+msgid ""
"Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
"reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
"span>"
@@ -2351,41 +2395,52 @@
"软件代æ¿ï¼å
¶å·¥ä½æ¹å¼ä¹å¤§æä¸åã使AndroidåGNU/Linuxä¸åçåå
æ£æ¯GNUç缺失ã"
#. type: Content of: <dl><dt>
-msgid ""
-"How much of the GNU system is needed for the system to be GNU/Linux? <span "
-"class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
+#, fuzzy
+#| msgid ""
+#| "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
+#| "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
+#| "span>"
+msgid ""
+"Is it correct to say “using Linux” if it refers to using GNU/"
+"Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
+"\"#usegnulinuxandandroidlinuxsyswithoutgnu"
+"\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
msgstr ""
-"éè¦å¤å°GNUçç³»ç»æè¦å«åGNU/Linuxç³»ç»ï¼<span
class=\"anchor-reference-id\">"
-"(<a href=\"#howmuch\">#howmuch</a>)</span>"
+"æ没æä¸å¸¦GNUçå®æ´çLinuxç³»ç»[sic]ï¼<span
class=\"anchor-reference-id\">(<a "
+"href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</span>"
#. type: Content of: <dl><dd>
msgid ""
-"“How much” is not a meaningful question because the GNU system "
-"does not have precise boundaries."
-msgstr "“å¤å°”ä¸æ¯ä¸ä¸ªææä¹çé®é¢ï¼å
为GNUç³»ç»å¹¶æ²¡æåç¡®çè¾¹çã"
+"Far from it. That usage is so strained that people will not understand the "
+"intended meaning."
+msgstr ""
#. type: Content of: <dl><dd><p>
msgid ""
-"GNU is an operating system maintained by a community. It includes far more "
-"than just the GNU software packages (of which we have a specific list), and "
-"people add more packages constantly. Despite these changes, it remains the "
-"GNU system, and adding Linux to that yields GNU/Linux. If you use part of "
-"the GNU system and omit part, there is no meaningful way to say “how "
-"much” you used."
+"The public will find it very strange to speak of using Android as “"
+"using Linux”. It's like having a conversation, then saying you were "
+"conversing with the person's intestines or the person's circulatory system."
msgstr ""
-"GNUæ¯ä¸ä¸ªç±ç¤¾åºç»´æ¤çæä½ç³»ç»ãå®å
å«çå
容è¿è¿å¤äºä»
ä»
æ¯GNU软件å
ï¼å¯¹æ¤æ们"
-"æä¸ä¸ªå表ï¼ï¼å¹¶ä¸äººä»¬ä¸ç´å¨æ·»å æ´å¤çå
ãé¤äºè¿äºæ´æ¹ï¼å®è¿æ¯GNUç³»ç»ï¼å ä¸"
-"Linux就产çäºGNU/Linuxãå¦æä½
使ç¨äºä¸é¨åGNUç³»ç»ï¼é£ä¹è¯´ä½ ç¨äº“å¤å°"
-"”并没æä»ä¹æä¹ã"
#. type: Content of: <dl><dd><p>
msgid ""
-"If we look at the level of packages, Linux is one important package in the "
-"GNU/Linux system. The inclusion of one important GNU package is enough to "
-"justify our request for equal mention."
+"The public <em>will</em> understand the idea of “using Linux” "
+"when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
+"of the whole system as “Linux”."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Use of Android and use of GNU/Linux are totally different, as different as "
+"driving a car and riding a bicycle. The fact that the first two both "
+"contain Linux is irrelevant to using them, just as the fact that a car and a "
+"bicycle both have a structure of metal is irrelevant to using those two. If "
+"you wish to talk about using cars and bikes, you wouldn't speak of “"
+"riding metal objects” — not unless you're playing games with the "
+"reader. You would say, “using cars and bikes.” Likewise, the "
+"clear way to talk about using GNU/Linux and Android is to say “using "
+"GNU/Linux and Android.”"
msgstr ""
-"å¦ææ们ççå
ç级å«ï¼Linuxæ¯GNU/Linuxç³»ç»çä¸ä¸ªéè¦çå
ãå
å«ä¸ä¸ªéè¦çGNUå
"
-"å·²ç»è¶³å¤æ们è¦æ±å¨å称ä¸å¹³ç对å¾
äºã"
#. type: Content of: <dl><dt>
msgid ""