www-commits
[Top][All Lists]
Advanced

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

www/philosophy gnutella.zh-cn.html po/gnutella....


From: GNUN
Subject: www/philosophy gnutella.zh-cn.html po/gnutella....
Date: Fri, 30 Mar 2018 09:28:18 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/03/30 09:28:18

Modified files:
        philosophy     : gnutella.zh-cn.html 
Added files:
        philosophy/po  : gnutella.zh-cn-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/gnutella.zh-cn.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gnutella.zh-cn-en.html?cvsroot=www&rev=1.1

Patches:
Index: gnutella.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/gnutella.zh-cn.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnutella.zh-cn.html 30 Dec 2011 05:18:40 -0000      1.4
+++ gnutella.zh-cn.html 30 Mar 2018 13:28:16 -0000      1.5
@@ -1,132 +1,97 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<HTML>
-<HEAD>
-<TITLE>¹ØÓÚ Gnutella - GNU ¼Æ»® - ×ÔÓÉÈí¼þ»ù½ð»á(FSF)</TITLE>
-<META http-equiv="Content-Type" content="text/html; charset=gb2312">
-<LINK REV="made" HREF="mailto:address@hidden";>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" 
VLINK="#9900DD">
-<H3>¹ØÓÚ Gnutella</H3>
-<P>
-<A HREF="/graphics/agnuhead.html"><IMG SRC="/graphics/gnu-head-sm.jpg"
-   ALT=" [image of the Head of a GNU] "
-   WIDTH="129" HEIGHT="122"></A>
-
-[
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-  <A HREF="/philosophy/gnutella.ca.html">¼ÓÌ©ÂÞÄáÑÇÓï</A>
-| <A HREF="/philosophy/gnutella.zh-cn.html">¼òÌåÖÐÎÄ</A>
-| <A HREF="/philosophy/gnutella.zh-tw.html">·±ÌåÖÐÎÄ</A>
-| <A HREF="/philosophy/gnutella.hr.html">¿ËÂÞµØÑÇÓï</A>
-| <A HREF="/philosophy/gnutella.en.html">Ó¢Óï</A>
-| <A HREF="/philosophy/gnutella.es.html">ÊÀ½çÓï</a>
-| <A HREF="/philosophy/gnutella.fr.html">·¨Óï</A>
-| <A HREF="/philosophy/gnutella.hu.html">ÐÙÑÀÀûÓï</A>
-| <A HREF="/philosophy/gnutella.id.html">Ó¡¶ÈÄáÎ÷ÑÇÓï</A>
-| <A HREF="/philosophy/gnutella.ja.html">ÈÕÓï</A>
-| <A HREF="/philosophy/gnutella.ko.html">³¯ÏÊÓï</A>
-| <A HREF="/philosophy/gnutella.pl.html">²¨À¼Óï</A>
-| <A HREF="/philosophy/gnutella.pt.html">ÆÏÌÑÑÀÓï</A>
-| <A HREF="/philosophy/gnutella.ro.html">ÂÞÂíÄáÑÇÓï</A>
-<!-- | A HREF="/boilerplate.LG.html" LANGUAGE /A  -->
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-]
-
-<P>
-
-"Gnutella" ²¢²»ÊÇÒ»¸öÕæÕýµÄ <A
-HREF="/philosophy/categories.html#GNUsoftware">GNU Èí¼þ</A>
-£¬²¢ÇÒÎÒÃÇÒ²²»ÄÜÈ·¶¨ËüÊÇÒ»¸ö <A
-HREF="/philosophy/free-sw.html">×ÔÓÉÈí¼þ</A>¡£
-ÊÂʵÉÏ¿´ÇåÕâ¸ö³ÌÐòµÄÓйØÐÅÏ¢¸ù±¾ÊǺÜÀ§Äѵġ£
-´óÔ¼Õâ¸ö³ÌÐòµÄԭʼ×÷Õß²ÉÓÃÕâ¸öÃû×ÖÊÇΪÁ˽«À´ÓÐÒ»Ìì°ÑËü·¢²¼³É GNU Èí¼þ£¬
-µ«ÊÇËûÃǵÄÀÏ°åÈ¡ÏûÁËÕâ¸ö¼Æ»®£¬¶øÇÒËüºÃÏñҲûÓÐÒÔ×ÔÓÉÈí¼þ·¢²¼¡£
-<P>
-
-ÓÐÒ»¶¨ÊýÁ¿µÄ×ÔÓÉÈí¼þÊÇÔÚÓë Gnutella ÏàͬµÄЭÒéÏÂÃæÉè¼Æ²¢¿ª·¢µÄ£¬±ÈÈç <A
-HREF="http://gtk-gnutella.sourceforge.net/";>gtk-gnutella</A>, <A
-href="http://mutella.sourceforge.net/";>mutella</A>, ºÍ <A
-href="http://sourceforge.net/projects/gnucleus/";>gnucleus</A>¡£
-¿ÉÊÇÇë×¢ÒâËûÃǵ±ÖÐûÓÐÒ»¸öÊÇÕæÕýÒâÒåÉ쵀 <A
-HREF="/philosophy/categories.html#GNUsoftware">GNU Èí¼þ</A>¡£
-<P>
-
-×ÔÓÉÈí¼þµÄ»ù´¡ÊǹØÐĸ´ÖƺÍÐÞ¸ÄÈí¼þµÄ×ÔÓÉ£»ÒôÀÖÖÆÆ·³¬³öÁËÕâ¸ö·¶Î§¡£
-µ«ÊǾÍÄܹ»×ÔÓɸ´ÖƵÄÈí¼þÓëÒôÀּǼ¶øÑÔ£¬ËûÃÇÓÐ×Ų¿·ÖµÄÏàËÆÐÔ¡£ÔÚ <A
-HREF="/philosophy/philosophy.html#Laws">ÕÜѧ</A>
-Ŀ¼ÖÐÓÐ̸µ½¹ØÓÚÈí¼þÒÔÍâÊÂÎïµÄ¸´ÖƵÄÒéÌâ¡£
-ÔÚÎÒÃÇÁ´½ÓµÄ <A
-HREF="/philosophy/philosophy.html#ThirdPartyIdeas">ÆäËû×÷ÕßµÄһЩÎÄÕÂ</A>
-ÀïÒ²ÓÐÏà¹ØµÄÂÛÊö¡£
-<P>
-
-²»ÂÛʲôÀàÐ͵ijö°æÐÅÏ¢±»¹²Ïí£¬
-ÎÒÃǶ¼Ç¿ÁÒÏ£ÍûÈËÃǾܾø ÓÐЩÈË»ò¹«Ë¾ ÈÏΪ×Ô¼º¾ßÓÐÌ츳ȨÀû£¬¶ø½ûÖ¹
-``¹²Ïí ÒÔ¼° ½Ìµ¼´óÖÚÈçºÎʹÓÃËü'' µÄ¼Ù¶¨¡£
-ÉõÖÁÃÀ¹úµÄ˾·¨ÏµÍ³Ò²ÔÚÃûÒåÉÏ <A
-HREF="/philosophy/reevaluating-copyright.html">·´¶Ô</A>
-ÕâÖÖ·´Éç»áµÄ˼Ïë¡£
-<P>
-<HR>
-
-[
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-  <A HREF="/philosophy/gnutella.ca.html">¼ÓÌ©ÂÞÄáÑÇÓï</A>
-| <A HREF="/philosophy/gnutella.zh-cn.html">¼òÌåÖÐÎÄ</A>
-| <A HREF="/philosophy/gnutella.zh-tw.html">·±ÌåÖÐÎÄ</A>
-| <A HREF="/philosophy/gnutella.hr.html">¿ËÂÞµØÑÇÓï</A>
-| <A HREF="/philosophy/gnutella.en.html">Ó¢Óï</A>
-| <A HREF="/philosophy/gnutella.es.html">ÊÀ½çÓï</a>
-| <A HREF="/philosophy/gnutella.fr.html">·¨Óï</A>
-| <A HREF="/philosophy/gnutella.hu.html">ÐÙÑÀÀûÓï</A>
-| <A HREF="/philosophy/gnutella.id.html">Ó¡¶ÈÄáÎ÷ÑÇÓï</A>
-| <A HREF="/philosophy/gnutella.ja.html">ÈÕÓï</A>
-| <A HREF="/philosophy/gnutella.ko.html">³¯ÏÊÓï</A>
-| <A HREF="/philosophy/gnutella.pl.html">²¨À¼Óï</A>
-| <A HREF="/philosophy/gnutella.pt.html">ÆÏÌÑÑÀÓï</A>
-| <A HREF="/philosophy/gnutella.ro.html">ÂÞÂíÄáÑÇÓï</A>
-<!-- | A HREF="/boilerplate.LG.html" LANGUAGE /A  -->
-<!-- Please keep this list alphabetical -->
-<!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-]
-
-<P>
-·µ»Ø <A HREF="/home.html">GNU Ê×Ò³</A>¡£
-<P>
-
-Ç뽫ÓйØ×ÔÓÉÈí¼þ»ù½ð»á(FSF) &amp; GNU µÄ²éѯ &amp; ÎÊÌâ·¢Ë͵½
-
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>¡£
-Ò²¿ÉÒÔͨ¹ý <A HREF="/home.html#ContactInfo">ÆäËûÁªÏµ·½·¨</A>
-ÁªÏµ×ÔÓÉÈí¼þ»ù½ð»á(FSF)¡£
-<P>
-
-Ç뽫ÓйØÍøÒ³µÄ½¨Òé·¢Ë͵½
-
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>£¬
-ÆäËûÎÊÌâ·¢Ë͵½
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>¡£
-<P>
-Copyright (C) 2000, 2001 Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA  02110,  USA
-<P>
-È«ÎÄÔÚ±£Ö¤ÍêÕûÐÔµÄÇ°ÌáÏ¿ÉÒÔÔÚÈÎÒâýÌåתÔØ - Ðë±£Áô´Ë±ê×¢¡£
-<P>
-·­Ò룺¹È ÕÂÁ¢
-<BR>
-ÑéÖ¤£ºÁõ ÕѺê
-<BR>
-Ç뽫Óйط­ÒëµÄÎÊÌâË͵½ <A HREF="http://savannah.gnu.org/projects/chinese/";>GNU 
ÖÐÒëС×é</A>¡£
-<P>
-Updated:
-<!-- timestamp start -->
-$Date: 2011/12/30 05:18:40 $ $Author: ineiev $
-<!-- timestamp end -->
+<!--#set var="ENGLISH_PAGE" value="/philosophy/gnutella.en.html" -->
+
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.84 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>关于Gnutella - GNU工程 - 自由软件基金会</title>
 
-<HR>
-</BODY>
-</HTML>
+<!--#include virtual="/philosophy/po/gnutella.translist" -->
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<h2>关于Gnutella</h2>
+
+<p>
+&ldquo;Gnutella&rdquo;目前是一个分布式文件å…
±äº«åè®®çš„名称,主要用于分享音乐文件。此名称有时也用来指该网络本身以及原始的Gnutella软件。这是一个相当混乱的æƒ
…况。更多关于Gnutella的渊源和历史,请参考该条目的<a
+href="http://en.wikipedia.org/wiki/Gnutella";>Wikipedia文章</a>。</p>
+
+<p>
+无论如何,这个名称最初是一个关于&ldquo;GNU&rdquo;(å…
¶åŽŸå§‹å¼€å‘者计划按GNU
+GPL发布代ç 
ï¼Œå¹¶ä¸”可能考虑贡献给GNU工程)和&ldquo;Nutella&rdquo;(å…
¶åŽŸå§‹å¼€å‘者喜欢的糖果店)两个字的组合。然而,å…
¶æœ€åˆç‰ˆå’Œå…¶åŽçš„任何版本都不是<a
+href="/philosophy/categories.html#GNUsoftware">正式的GNU软件包
</a>。我们已经请求Gnutella的开发者改名以避å…
æ··æ·†ï¼›ä¹Ÿè®¸åœ¨å°†æ¥æŸä¸€å¤©ï¼Œä»–们会改吧。</p>
+
+<p>
+有好几个自由软件实现了Gnutella协议,比如<a
+href="http://gtk-gnutella.sourceforge.net/en/";>Gtk-Gnutella</a>、<a
+href="http://mutella.sourceforge.net/";>Mutella</a>和<a
+href="http://sourceforge.net/projects/gnucleus/";>Gnucleus</a>。不过,请注意,这些也都不是正式的<a
+href="/philosophy/categories.html#GNUsoftware">GNU软件</a>。GNU有自己的点对点网络程序,<a
+href="/software/gnunet/">GNUnet</a>,其文档包含有<a
+href="https://gnunet.org/compare";>类似的协议</a>。</p>
+
+<p>
+自由软件基金会å…
³å¿ƒçš„是复制和更改软件的自由;音乐不是我们的范畴。但是复制软件和复制音乐拷贝有一部分类似的道德问题。在<a
+href="/philosophy/essays-and-articles.html#Laws">哲学</a>目录下有一些å…
³äºŽå¤åˆ¶è½¯ä»¶ä»¥å¤–事物的文章。我们还链接了一些<a
+href="/philosophy/third-party-ideas.html">其他人的文章
</a>,也是讨论相关话题的。</p>
+
+<p>
+无论分享什么样的公开信息,我们鼓励人们反对这æ 
·çš„假设&mdash;某些个人或公司拥有禁止分享和强行规定å…
¬ä¼—如何使用该信息的自然权力。即使美国法律在名义上也<a
+href="/philosophy/reevaluating-copyright.html">拒绝</a>这种反社会的想法。</p>
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会(FSF)&amp;GNU的一般性问题发送到<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过<a
+href="/contact/">å…
¶ä»–联系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+若您想翻译本文,请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
+</div>
+
+<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018 Free Software
+Foundation, Inc.</p>
+
+<p>本文使用<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>授权。</p>
+
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<b>翻译团队</b>:<a rel="team"
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018。</div>
 
+<p class="unprintable"><!-- timestamp start -->
+最后更新:
+
+$Date: 2018/03/30 13:28:16 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: po/gnutella.zh-cn-en.html
===================================================================
RCS file: po/gnutella.zh-cn-en.html
diff -N po/gnutella.zh-cn-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ po/gnutella.zh-cn-en.html   30 Mar 2018 13:28:18 -0000      1.1
@@ -0,0 +1,105 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.84 -->
+<title>Regarding Gnutella
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/philosophy/po/gnutella.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Regarding Gnutella</h2>
+
+<p>
+&ldquo;Gnutella&rdquo; is, at present, the name for a protocol for distributed
+file sharing, mostly used for music files.  The name also sometimes
+refers to the network itself, as well as the original Gnutella software.
+The situation is quite confusing.  For more on Gnutella's
+origin and history, please refer to the <a
+href="http://en.wikipedia.org/wiki/Gnutella";>Wikipedia article</a> on
+the subject.</p>
+
+<p>
+In any case, the name was originally a word play on &ldquo;GNU&rdquo;
+(the original developers planned to release their code under the GNU
+GPL, and may have had in mind contributing it to the GNU project) and
+&ldquo;Nutella&rdquo; (a candy bar that the original developers
+enjoyed).  However, neither the original software nor any of the
+related current projects
+are <a href="/philosophy/categories.html#GNUsoftware">official GNU
+packages</a>.  We have asked that the Gnutella developers change the
+name to avoid confusion; perhaps that will happen in the future.</p>
+
+<p>
+There are a number of free software programs that implement the
+Gnutella protocol, such as <a
+href="http://gtk-gnutella.sourceforge.net/en/";>Gtk-Gnutella</a>, <a
+href="http://mutella.sourceforge.net/";>Mutella</a>, and <a
+href="http://sourceforge.net/projects/gnucleus/";>Gnucleus</a>.  Please
+note, however, that none of these programs are officially <a
+href="/philosophy/categories.html#GNUsoftware">GNU software</a>
+either.  GNU has its own peer-to-peer networking program, <a
+href="/software/gnunet/">GNUnet</a>, whose
+documentation includes a <a
+href="https://gnunet.org/compare";>comparison of the
+protocols</a>.</p>
+
+<p>
+The Free Software Foundation is concerned with the freedom to copy and
+change software; music is outside our scope.  But there is a partial
+similarity in the ethical issues of copying software and copying
+recordings of music.  Some articles in the
+<a href="/philosophy/essays-and-articles.html#Laws">philosophy</a> directory
+relate to the issue of copying for things other than software.  Some
+of the <a href="/philosophy/third-party-ideas.html">other 
+people's articles</a> we have links to are also relevant.</p>
+
+<p>
+No matter what sort of published information is being shared, we urge
+people to reject the assumption that some person or company has a
+natural right to prohibit sharing and dictate exactly how the public
+can use it.  Even the US legal system nominally
+<a href="/philosophy/reevaluating-copyright.html">rejects</a> that
+anti-social idea.</p>
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF &amp; GNU inquiries to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a
+href="/contact/">other ways to contact</a> the FSF.  Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations README</a> for
+information on coordinating and submitting translations of this article.</p>
+</div>
+
+<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018 Free Software 
Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2018/03/30 13:28:18 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>



reply via email to

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