[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy categories.zh-cn.html po/categor...
|
From: |
GNUN |
|
Subject: |
www/philosophy categories.zh-cn.html po/categor... |
|
Date: |
Sat, 18 Sep 2021 01:31:26 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 21/09/18 01:31:26
Modified files:
philosophy : categories.zh-cn.html
philosophy/po : categories.zh-cn-en.html categories.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.zh-cn.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn.po?cvsroot=www&r1=1.18&r2=1.19
Patches:
Index: categories.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/categories.zh-cn.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- categories.zh-cn.html 19 Aug 2021 08:13:17 -0000 1.9
+++ categories.zh-cn.html 18 Sep 2021 05:31:25 -0000 1.10
@@ -8,12 +8,11 @@
<!-- This file is automatically generated by GNUnited Nations! -->
<title>èªç±ä¸éèªç±è½¯ä»¶çåç±» - GNU å·¥ç¨ -
èªç±è½¯ä»¶åºéä¼</title>
-<style type="text/css" media="screen">
-<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
+<style type="text/css" media="screen"><!--
+#diagram { width: 32em; max-width: 100%; margin: 2.5em auto 2em; }
+#diagram img { width: 29.9em; height: auto; overflow: auto; }
+#diagram p { font-size: .88em; text-align: justify; }
-->
-
</style>
<!--#include virtual="/philosophy/po/categories.translist" -->
@@ -21,22 +20,24 @@
<!--#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>èªç±ä¸éèªç±è½¯ä»¶çåç±»</h2>
-<p>å¦è§<a
-href="/philosophy/words-to-avoid.html">ãåºé¿å
使ç¨ï¼ææ
ç¨ï¼çè¯è¯ï¼ç±äºå®ä»¬æ¯ä¸å
¬æ£çæè
å¼èµ·æ··æ·çã</a>ä¸æã</p>
-
<!-- GNUN: localize URL /philosophy/category.zh-cn.png -->
-<p id="diagram" class="c">
+<div id="diagram" class="c" role="figure" aria-labelledby="caption">
<img src="/philosophy/category.zh-cn.png"
alt="[èªç±ä¸éèªç±è½¯ä»¶çåç±»]" />
-</p>
-
- <p>æ¬å¾æåç± Chao-Kuei åä½å¹¶ä¸ç»è¿å
¶ä»äººçæ´æ°ï¼è§£éäºä¸åç±»å«ç软件ä¹é´çåºå«ãå®æ<a
+ <p id="caption">
+ æ¬å¾æåç± Chao-Kuei åä½å¹¶ä¸ç»è¿å
¶ä»äººçæ´æ°ï¼è§£éäºä¸åç±»å«ç软件ä¹é´çåºå«ãå®æ<a
href="/philosophy/category.svg">ç¢éå¾ç</a>ï¼ä»¥å<a
href="/philosophy/category.zh-cn.svg">ä¸æç¢éå¾ç</a>ï¼ä»¥å<a
href="/philosophy/category.fig">XFig æ ¼å¼çæ¬</a>ãæ¬å¾éç¨ GNU
éç¨å
Œ
±è®¸å¯è¯ï¼GNU GPLï¼2.0
ææ´é«çæ¬ãGNU èªç±æ档许å¯è¯ï¼GNU FDLï¼1.2
ææ´é«çæ¬ãæè
åä½å
±ç¨-ç½²å-ç¸åæ¹å¼å
±äº«ï¼CC
BY-SAï¼è®¸å¯è¯ 2.0 ææ´é«çæ¬ã</p>
+</div>
+
+<div class="announcement" role="complementary">
+<p>å¦è§<a
+href="/philosophy/words-to-avoid.html">ãåºé¿å
使ç¨ï¼ææ
ç¨ï¼çè¯è¯ï¼ç±äºå®ä»¬æ¯ä¸å
¬æ£çæè
å¼èµ·æ··æ·çã</a>ä¸æã</p>
+</div>
<h3 id="FreeSoftware">èªç±è½¯ä»¶ï¼Free Softwareï¼</h3>
@@ -265,6 +266,22 @@
<a href="/server/standards/README.translations.html">ãè¯è
æåã</a>ã</p>
</div>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
<p>Copyright © 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021
Free Software Foundation, Inc.</p>
@@ -284,7 +301,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2021/08/19 08:13:17 $
+$Date: 2021/09/18 05:31:25 $
<!-- timestamp end -->
</p>
Index: po/categories.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/categories.zh-cn-en.html 19 Aug 2021 08:13:23 -0000 1.4
+++ po/categories.zh-cn-en.html 18 Sep 2021 05:31:26 -0000 1.5
@@ -5,35 +5,36 @@
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Categories of Free and Nonfree Software
- GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
-<!--
-#content #diagram { overflow: auto; margin: 2em 0; }
-#diagram img { width: 31.7em; }
--->
-</style>
+<style type="text/css" media="screen"><!--
+#diagram { width: 32em; max-width: 100%; margin: 2.5em auto 2em; }
+#diagram img { width: 29.9em; height: auto; overflow: auto; }
+#diagram p { font-size: .88em; text-align: justify; }
+--></style>
<!--#include virtual="/philosophy/po/categories.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="reduced-width">
+<div class="article reduced-width">
<h2>Categories of Free and Nonfree Software</h2>
-<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
- Words which You Might Want to Avoid</a>.</p>
-
<!-- GNUN: localize URL /philosophy/category.png -->
-<p id="diagram" class="c">
+<div id="diagram" class="c" role="figure" aria-labelledby="caption">
<img src="/philosophy/category.png" alt=" [Categories of software] " />
-</p>
-
- <p>This diagram, originally by Chao-Kuei and updated by several
+ <p id="caption">
+ This diagram, originally by Chao-Kuei and updated by several
others since, explains the different categories of software. It's
available as a <a href="/philosophy/category.svg">Scalable Vector
Graphic</a> and as an <a href="/philosophy/category.fig">XFig
document</a>, under the terms of any of the GNU GPL v2 or later,
the GNU FDL v1.2 or later, or the Creative Commons
Attribution-Share Alike v2.0 or later.</p>
+</div>
+
+<div class="announcement" role="complementary">
+<p>Also see <a href="/philosophy/words-to-avoid.html">Confusing
+ Words which You Might Want to Avoid</a>.</p>
+</div>
<h3 id="FreeSoftware">Free software</h3>
@@ -76,7 +77,7 @@
<p>Many languages have two separate words for
“free” as in freedom and “free” as in
zero price. For example, French has “libre” and
- “gratuit”. Not so English; there is a word
+ “gratuit.” Not so English; there is a word
“gratis” that refers unambiguously to price, but
no common adjective that refers unambiguously to freedom. So
if you are speaking another language, we suggest you translate
@@ -129,7 +130,7 @@
mean <a href="#FreeSoftware">“free”</a> or
“available gratis.” However, “public
domain” is a legal term and means, precisely, “not
- copyrighted”. For clarity, we recommend using
+ copyrighted.” For clarity, we recommend using
“public domain” for that meaning only, and using
other terms to convey the other meanings.</p>
@@ -169,7 +170,7 @@
However, in actual practice nearly all copylefted software uses the
<a href="/licenses/gpl.html">GNU General Public
License</a>. Two different copyleft licenses are usually
- “incompatible”, which means it is illegal to merge
+ “incompatible,” which means it is illegal to merge
the code using one license with the code using the other
license; therefore, it is good for the community if people use
a single copyleft license.</p>
@@ -254,7 +255,7 @@
<p>“GNU programs” is equivalent
to <a href="#GNUsoftware">GNU software.</a> A program Foo is a
GNU program if it is GNU software. We also sometimes say it
- is a “GNU package”.</p>
+ is a “GNU package.”</p>
<h3 id="GNUsoftware">GNU software</h3>
@@ -305,9 +306,9 @@
<p>Proprietary software is another name for nonfree software.
In the past we subdivided nonfree software into
- “semifree software”, which could be modified and
+ “semifree software,” which could be modified and
redistributed noncommercially, and “proprietary
- software”, which could not be. But we have dropped that
+ software,” which could not be. But we have dropped that
distinction and now use “proprietary software” as
synonymous with nonfree software.</p>
@@ -440,6 +441,23 @@
information on coordinating and contributing translations of this article.</p>
</div>
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+ files generated as part of manuals) on the GNU web server should
+ be under CC BY-ND 4.0. Please do NOT change or remove this
+ without talking with the webmasters or licensing team first.
+ Please make sure the copyright date is consistent with the
+ document. For web pages, it is ok to list just the latest year the
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
<p>Copyright © 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021
Free
Software Foundation, Inc.</p>
@@ -451,7 +469,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2021/08/19 08:13:23 $
+$Date: 2021/09/18 05:31:26 $
<!-- timestamp end -->
</p>
</div>
Index: po/categories.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/categories.zh-cn.po 18 Sep 2021 05:24:47 -0000 1.18
+++ po/categories.zh-cn.po 18 Sep 2021 05:31:26 -0000 1.19
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-09-11 09:55+0000\n"
#. type: Content of: <title>
msgid ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy categories.zh-cn.html po/categor...,
GNUN <=