[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy contradictory-support.zh-cn.html...
|
From: |
GNUN |
|
Subject: |
www/philosophy contradictory-support.zh-cn.html... |
|
Date: |
Wed, 22 Sep 2021 06:03:21 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/09/22 06:03:21
Modified files:
philosophy : contradictory-support.zh-cn.html
using-gfdl.zh-cn.html
philosophy/po : contradictory-support.zh-cn-en.html
contradictory-support.zh-cn.po
using-gfdl.zh-cn-en.html using-gfdl.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/contradictory-support.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/using-gfdl.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/contradictory-support.zh-cn-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/contradictory-support.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.zh-cn-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/using-gfdl.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
Patches:
Index: contradictory-support.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/contradictory-support.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- contradictory-support.zh-cn.html 17 Dec 2020 06:01:11 -0000 1.1
+++ contradictory-support.zh-cn.html 22 Sep 2021 10:03:19 -0000 1.2
@@ -1,16 +1,24 @@
<!--#set var="ENGLISH_PAGE" value="/philosophy/contradictory-support.en.html"
-->
<!--#include virtual="/server/header.zh-cn.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays upholding action" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>è¦æé£äºèªç¸çç¾ç “æ¯æ” - GNU å·¥ç¨ -
èªç±è½¯ä»¶åºéä¼</title>
<!--#include virtual="/philosophy/po/contradictory-support.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.zh-cn.html" -->
+<div class="article reduced-width">
+
<h2>è¦æé£äºèªç¸çç¾ç “æ¯æ”</h2>
-<p><strong>Richard Stallman</strong> è</p>
+<address class="byline"><strong>Richard Stallman</strong> è</address>
<p>æä¸äºç»ç»å®£ç§°ä»ä»¬æ¯æèªç±è½¯ä»¶æè
GNU
å·¥ç¨ï¼å¹¶ä¸å¹è®éèªç±è½¯ä»¶ç使ç¨ã</p>
@@ -32,6 +40,7 @@
<p>å¦æä»ä»¬è®©ä½ åå è¿äºè¯¾ç¨ï¼æ 论æ¯å½å¦çæè
æ¯å½èå¸ï¼é£ä¹é½æ¯ç»ä½ æºä¼åä»ä»¬ <a
href="/philosophy/saying-no-even-once.html">说ä¸</a>ã</p>
+</div>
<div class="translators-notes">
@@ -41,7 +50,7 @@
<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.zh-cn.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>请å°æå
³èªç±è½¯ä»¶åºéä¼(FSF) &
GNUçä¸è¬æ§é®é¢åéå°<a
@@ -60,13 +69,13 @@
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
æ们尽æ大åªåæ¥æä¾ç²¾ååé«è´¨éçç¿»è¯ï¼ä½é¾å
ä¼åå¨é误åä¸è¶³ãå¦ææ¨å¨è¿æ¹é¢æè¯è®ºæä¸è¬æ§ç建议ï¼è¯·åéè³
<a
href="mailto:web-translators@gnu.org";><web-translators@gnu.org></a>ã</p><p>å
³äºè¿è¡åè°ä¸æ交翻è¯çæ´å¤ä¿¡æ¯åè§
-<a href="/server/standards/README.translators.html">ãè¯è
æåã</a>ã</p>
+<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
<!-- Regarding copyright, in general, standalone pages (as opposed to
@@ -85,7 +94,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2020 Richard Stallman</p>
+<p>Copyright © 2016, 2020, 2021 Richard Stallman</p>
<p>æ¬é¡µé¢ä½¿ç¨ <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -96,16 +105,17 @@
<!--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/";><CTT></a>ï¼2020ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2020ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2020/12/17 06:01:11 $
+$Date: 2021/09/22 10:03:19 $
<!-- timestamp end -->
</p>
</div>
</div>
+<!-- for class="inner", starts in the banner include -->
</body>
</html>
Index: using-gfdl.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/using-gfdl.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- using-gfdl.zh-cn.html 19 Aug 2021 08:13:22 -0000 1.6
+++ using-gfdl.zh-cn.html 22 Sep 2021 10:03:19 -0000 1.7
@@ -14,12 +14,11 @@
<!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#include virtual="/server/top-addendum.zh-cn.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
<h2>使ç¨GNU FDL</h2>
<address class="byline"><a
href="https://www.stallman.org/";>çæ¥å¾·Â·æ¯ææ¼</a> è</address>
-<div class="article">
<p>å¦æä½
ç¥éæ人æ£å¨æ°åèªç±è½¯ä»¶ç使ç¨æåï¼å¹¶ä¸è®¡ååä¸åºçï¼é£ä¹ä½
ææºä¼è±å°åæ°ä¸ºèªç±è½¯ä»¶è¿å¨å大äºï¼åé£ä½ä½è
建议使ç¨<a
href="/licenses/fdl.html">GNUèªç±æ档许å¯è¯</a>åºç该æåã</p>
@@ -35,13 +34,13 @@
<p>è¿æ<a
href="/licenses/license-list.html#DocumentationLicenses">å
¶ä»</a>ä¸äºåæ³çèªç±æ档许å¯è¯ï¼ä½æ¯ä½¿ç¨å®ä»¬æ¶ææ¶è¦å°å¿ãä¾å¦ï¼æ个许å¯è¯å¸¦æ两ç§å¯éæ¡æ¬¾ï¼åªæå½è¿ä¸¤ä¸ªå¯éæ¡æ¬¾é½æ²¡æ被使ç¨æ¶ï¼è¯¥è¯ä¹¦ææ¯èªç±çï¼ä½å¦æä»»æä¸ä¸ªæ¡æ¬¾è¢«ä½¿ç¨ï¼é£ä¹å°å¯¼è´è¿æ¬ä¹¦éèªç±ãï¼è¯·åé
<a
-href="/licenses/license-list.html">http://www.gnu.org/licenses/license-list.html</a>ãï¼å¦æä½è
æ³ä½¿ç¨GNU
+href="/licenses/license-list.html">
+gnu.org/licenses/license-list.html</a>ãï¼å¦æä½è
æ³ä½¿ç¨GNU
FDLä¹å¤ç许å¯è¯æ¥åºçèªç±ææ¡£ï¼è¯·ä¸æ们èç³»ãæ们å¯ä»¥å¸®å©æ£æ¥è¯¥è®¸å¯è¯æ¯å¦çç符åèªç±ææ¡£çè¦æ±ã</p>
<p>å½ä¸ä¸ªåä¸æåæ¯èªç±çï¼å¹¶ä¸GNUç³»ç»æå
³ï¼GNUå·¥ç¨å°åå
¬ä¼æ¨èå®ãå æ¤ï¼å¦æä½è
æåºçåå建äºæè¿°æåºå®è¯¥æåçç½é¡µï¼æ们å¯ä»¥å¨<a
href="/doc/other-free-books.html">www.gnu.org/doc/other-free-books.html</a>æ·»å
ä¸ä¸ªé¾æ¥æå该ç½é¡µï¼ä½åææ¯è¯¥ç½é¡µé¡»ç¬¦åæ们ç常è§æ
åï¼ä¾å¦ï¼å®ä¸åºè¯¥é¾æ¥å°å
¶ä»éèªç±è½¯ä»¶æææ¡£ï¼ä¹ä¸è¦ä»¤äººè®¨åå°å说大家è´ä¹°è¯¥æåï¼ã请å°è¯¥é¡µé¢çä¿¡æ¯åç»<a
href="mailto:webmasters@gnu.org";> <webmasters@gnu.org></a>ã</p>
-</div>
<hr class="column-limit" />
<p>请åæ¶åç<a
href="/philosophy/free-doc.html">èªç±è½¯ä»¶åèªç±ææ¡£</a>ã</p>
@@ -111,12 +110,12 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯</b>ï¼çå©å¼ºï¼2000ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018ã</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2018ï¼2021ã</div>
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2021/08/19 08:13:22 $
+$Date: 2021/09/22 10:03:19 $
<!-- timestamp end -->
</p>
Index: po/contradictory-support.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/contradictory-support.zh-cn-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/contradictory-support.zh-cn-en.html 21 Dec 2020 07:31:02 -0000
1.2
+++ po/contradictory-support.zh-cn-en.html 22 Sep 2021 10:03:19 -0000
1.3
@@ -1,13 +1,20 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.96 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="TAGS" value="essays upholding action" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Beware of Contradictory “Support”
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/contradictory-support.translist" -->
<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#include virtual="/server/top-addendum.html" -->
+<div class="article reduced-width">
<h2>Beware of Contradictory “Support”</h2>
-<p>by <strong>Richard Stallman</strong></p>
+<address class="byline">by Richard Stallman</address>
<p>There are organizations that proclaim support for free software or
the GNU Project, and teach classes in use of nonfree software.</p>
@@ -50,10 +57,11 @@
teacher, that gives you an opportunity
to <a href="/philosophy/saying-no-even-once.html"> say no</a> for a
change.</p>
+</div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
-<div id="footer">
+<div id="footer" role="contentinfo">
<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
@@ -71,13 +79,13 @@
to <a href="mailto:web-translators@gnu.org";>
<web-translators@gnu.org></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing 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
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -98,7 +106,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2016, 2020 Richard Stallman</p>
+<p>Copyright © 2016, 2020, 2021 Richard Stallman</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -108,10 +116,10 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/12/21 07:31:02 $
+$Date: 2021/09/22 10:03:19 $
<!-- timestamp end -->
</p>
</div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
Index: po/contradictory-support.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/contradictory-support.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/contradictory-support.zh-cn.po 22 Sep 2021 09:31:51 -0000 1.7
+++ po/contradictory-support.zh-cn.po 22 Sep 2021 10:03:20 -0000 1.8
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-09-02 10:56+0000\n"
#. type: Content of: <title>
msgid ""
Index: po/using-gfdl.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/using-gfdl.zh-cn-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/using-gfdl.zh-cn-en.html 19 Aug 2021 08:13:29 -0000 1.3
+++ po/using-gfdl.zh-cn-en.html 22 Sep 2021 10:03:20 -0000 1.4
@@ -10,13 +10,12 @@
<!--#include virtual="/philosophy/ph-breadcrumb.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
<h2>Using GNU FDL</h2>
<address class="byline">by <a href="https://www.stallman.org/";>Richard
Stallman</a></address>
-<div class="article">
<p>If you know someone who is writing a manual about free software,
and looking towards commercial publication, you have a chance to help
the Free Software Movement a great deal with a small amount of work:
@@ -36,7 +35,7 @@
<p>But publishers are likely to first propose an ordinary proprietary
book. And if the authors agree, that's what it will be. So it is
essential for authors to take the lead; to say, “We want to use
-the GNU FDL for this book”. So when your friend mentions
+the GNU FDL for this book.” So when your friend mentions
writing a manual, you can influence the course of events simply by
pointing out this possibility.</p>
@@ -51,7 +50,7 @@
optional clauses that can be enabled; the license is free if neither
optional clause is used, but enabling either of them makes the book
nonfree. (See <a href="/licenses/license-list.html">
-http://www.gnu.org/licenses/license-list.html.</a>) Authors that want
+gnu.org/licenses/license-list.html</a>.) Authors that want
to publish free documentation, but using a license other than the GNU
FDL, can contact us so we can check that the license really qualifies
for free documentation.</p>
@@ -66,7 +65,6 @@
should not be obnoxious about trying to persuade people to buy).
Please inform <a href="mailto:webmasters@gnu.org";>
<webmasters@gnu.org></a> about such pages.</p>
-</div>
<hr class="column-limit" />
<p>See also <a href="/philosophy/free-doc.html">Free Software and Free
@@ -130,7 +128,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/08/19 08:13:29 $
+$Date: 2021/09/22 10:03:20 $
<!-- timestamp end -->
</p>
</div>
Index: po/using-gfdl.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/using-gfdl.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/using-gfdl.zh-cn.po 22 Sep 2021 09:40:24 -0000 1.8
+++ po/using-gfdl.zh-cn.po 22 Sep 2021 10:03:20 -0000 1.9
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-09-10 11:26+0000\n"
#. type: Content of: <title>
msgid "Using GNU FDL - GNU Project - Free Software Foundation"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy contradictory-support.zh-cn.html...,
GNUN <=