www doc/other-free-books.zh-cn.html doc/po/othe...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     22/11/25 22:59:42

Modified files:
        doc            : other-free-books.zh-cn.html 
        doc/po         : other-free-books.zh-cn-en.html 
                         other-free-books.zh-cn.po 
        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/doc/other-free-books.zh-cn.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/other-free-books.zh-cn-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/other-free-books.zh-cn.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.zh-cn.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-cn.po?cvsroot=www&r1=1.22&r2=1.23

Patches:
Index: doc/other-free-books.zh-cn.html
===================================================================
RCS file: /web/www/www/doc/other-free-books.zh-cn.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- doc/other-free-books.zh-cn.html     25 Jan 2022 03:31:33 -0000      1.21
+++ doc/other-free-books.zh-cn.html     26 Nov 2022 03:59:41 -0000      1.22
@@ -56,8 +56,8 @@
 </p>
 
 <p>
-后来，一些商业出版商也开始出版自由书籍（和我们的书一æ
 
·ï¼Œæ˜¯è¨€è®ºè‡ªç”±çš„自由；商业出版当然是出售的。）在本页，我们维护此类书籍的列表。如果ä½
 发现有的自由书籍没有列出，请写邮件给&lt;<a
-href="mailto:free-books@gnu.org";>free-books@gnu.org&gt;</a>告诉我们。
+一些商业出版商也出版自由书籍（和我们的书一æ 
·ï¼Œè¿™äº›ä¹¦ä¹Ÿæ˜¯è¨€è®ºè‡ªç”±çš„自由；当然，商业出版是为了出售。）在本页，我们维护我们所知的此类书籍的列表。如果ä½
 发现有的自由书籍没有列出，请写邮件给&lt;<a
+href="mailto:info@fsf.org";>info@fsf.org&gt;</a>告诉我们。
 </p>
 
 <p>其中有些出版商（比如，Network Theory
@@ -496,7 +496,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2022/01/25 03:31:33 $
+$Date: 2022/11/26 03:59:41 $
 
 <!-- timestamp end -->
 </p>

Index: doc/po/other-free-books.zh-cn-en.html
===================================================================
RCS file: /web/www/www/doc/po/other-free-books.zh-cn-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- doc/po/other-free-books.zh-cn-en.html       25 Jan 2022 03:31:35 -0000      
1.17
+++ doc/po/other-free-books.zh-cn-en.html       26 Nov 2022 03:59:41 -0000      
1.18
@@ -63,7 +63,7 @@
 printed copies are sold.)  On this page, we list the ones
 we have come across.  If you find out about a free book that is not
 listed here, please let us know by writing to &lt;<a
-href="mailto:free-books@gnu.org";>free-books@gnu.org</a>&gt;.
+href="mailto:info@fsf.org";>info@fsf.org</a>&gt;.
 </p>
 
 <p>Some of these publishers (e.g., Network Theory Ltd) do not trade
@@ -486,7 +486,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2022/01/25 03:31:35 $
+$Date: 2022/11/26 03:59:41 $
 <!-- timestamp end -->
 </p>
 </div>

Index: doc/po/other-free-books.zh-cn.po
===================================================================
RCS file: /web/www/www/doc/po/other-free-books.zh-cn.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- doc/po/other-free-books.zh-cn.po    26 Nov 2022 03:35:00 -0000      1.47
+++ doc/po/other-free-books.zh-cn.po    26 Nov 2022 03:59:41 -0000      1.48
@@ -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: 2022-11-25 16:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -451,8 +450,8 @@
 "Open Publication License, Version&nbsp;1.0 (no options exercised)  <a href="
 "\"#ALP_NOTE\">(See note below)</a>"
 msgstr ""
-"Open Publication License, Version&nbsp;1.0ï¼ˆæ— é€‰æ‹©æƒï¼‰<a 
href=\"#ALP_NOTE"
-"\">（请参看注解）</a>"
+"Open Publication License, Version&nbsp;1.0ï¼ˆæ— é€‰æ‹©æƒï¼‰<a 
href=\"#ALP_NOTE\">"
+"（请参看注解）</a>"
 
 #. type: Content of: <table><tr><td>
 msgid ""

Index: philosophy/categories.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/categories.zh-cn.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/categories.zh-cn.html    24 Nov 2022 15:29:55 -0000      1.11
+++ philosophy/categories.zh-cn.html    26 Nov 2022 03:59:42 -0000      1.12
@@ -9,9 +9,15 @@
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>自由与非自由软件的分类 - GNU 工程 - 
自由软件基金会</title>
 <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; }
+#diagram { width: 40em; margin-top: 2.5em; }
+#diagram object { width: 100%; height: auto; }
+#caption { text-align: justify; }
+#also-read { width: 40em; max-width: 100%; margin: auto; }
+@media (max-width: 38em) {
+  #diagram { overflow: auto; }
+  #diagram object { min-width: 35em; }
+  #diagram p { text-align: initial; }
+}
 -->
 </style>
 
@@ -21,22 +27,22 @@
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
 <div class="article reduced-width">
-<h2>自由与非自由软件的分类</h2>
+<h2 class="c">自由与非自由软件的分类</h2>
 
-<!-- GNUN: localize URL /philosophy/category.zh-cn.png -->
-<div id="diagram" class="c" role="figure" aria-labelledby="caption">
-<img src="/philosophy/category.zh-cn.png" 
alt="[自由与非自由软件的分类]" />
-      <p id="caption">
-      本图最初由 Chao-Kuei 创作并且经过å…
¶ä»–人的更新，解释了不同类别的软件之间的区别。它有<a
-href="/philosophy/category.zh-cn.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>
+<!-- GNUN: localize URL /philosophy/category.zh-cn.svg -->
+<div id="diagram" class="pict" role="figure" aria-labelledby="caption">
+       <object type="image/svg+xml" data="/philosophy/category.zh-cn.svg" 
title="
+[Categories of software] " width="680px" height="auto"></object>
+       <p 
id="caption">本图可以点击，用来解释不同类别软件之间的区别。它有
 <a href="/philosophy/category.zh-cn.svg">矢量图版</a>（<a
+href="/philosophy/category.zh-cn.svg">中文矢量图版</a>）以及 <a
+href="/philosophy/category.png">png æ ¼å¼ç‰ˆæœ¬</a>。本图采用 <a
+href="https://creativecommons.org/licenses/by-sa/4.0/";
+rel="license">Creative Commons Attribution-ShareAlike 4.0 International</a>
+许可证授权。</p>
 </div>
 
-<div class="announcement" role="complementary">
-<p>另见<a
-href="/philosophy/words-to-avoid.html">《应避免使用（或æ…
Žç”¨ï¼‰çš„词语，由于它们是不公正的或者
引起混淆的》</a>一文。</p>
+<div id="also-read" role="complementary">
+       <p class="announcement">另见 <a 
href="/philosophy/words-to-avoid.html">《应避免使用（或æ…
Žç”¨ï¼‰çš„词语》</a>一文。</p>
 </div>
 
 <h3 id="FreeSoftware">自由软件（Free Software）</h3>
@@ -64,8 +70,8 @@
 
 <h3 id="OpenSource">开源软件（Open Source Software）</h3>
 
-       <p>
-       
&ldquo;开源软件&rdquo;这一短语被某些人用于指代与自由软件或多或少地相同的一类软件。它们并不是与自由软件严æ
 
¼ä¸€è‡´çš„一类软件：它们接受某些在我们看来约束性过强的许可证（条款），也有一些自由软件许可证（条款）是它们所拒绝接受的。然而，两è€
…
外延的差别并不大：就我们所知，只有很少的开源软件不是自由软件。理论上，可能也会有自由软件不被接受为是开源软件，但是我们还没有看到实é™
…的例子。</p>
+       
<p>&ldquo;开源软件&rdquo;这一短语被某些人用于指代与自由软件或多或少地相同的一类软件。它们并不是与自由软件严æ
 
¼ä¸€è‡´çš„一类软件：它们接受某些在我们看来约束性过强的许可证（条款），也有一些自由软件许可证（条款）是它们所拒绝接受的。然而，两è€
…
外延的差别并不大：就我们所知，只有很少的开源软件不是自由软件。理论上，可能也会有自由软件不被接受为是开源软件，但是我们还没有看到实é™
…的例子。</p>
+
        
<p>我们倾向于使用自由软件这一概念，由于它代表自由&mdash;&mdash;这是&ldquo;<a
 
href="/philosophy/open-source-misses-the-point.html">开源</a>&rdquo;这一短语所不能体现的。</p>
 
@@ -282,7 +288,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021
+<p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2022
 Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
@@ -296,12 +302,12 @@
 <b>翻译</b>:<a rel="team"
 href="https://savannah.nongnu.org/projects/blug/";>BLUG</a>，2016<br></br>
 <b>翻译团队</b>：<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2019，2021。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>，2019-2022。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新：
 
-$Date: 2022/11/24 15:29:55 $
+$Date: 2022/11/26 03:59:42 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/categories.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/categories.zh-cn-en.html      18 Sep 2021 05:31:26 -0000      
1.5
+++ philosophy/po/categories.zh-cn-en.html      26 Nov 2022 03:59:42 -0000      
1.6
@@ -6,9 +6,15 @@
 <title>Categories of Free and Nonfree Software
 - GNU Project - Free Software Foundation</title>
 <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; }
+#diagram { width: 40em; margin-top: 2.5em; }
+#diagram object { width: 100%; height: auto; }
+#caption { text-align: justify; }
+#also-read { width: 40em; max-width: 100%; margin: auto; }
+@media (max-width: 38em) {
+  #diagram { overflow: auto; }
+  #diagram object { min-width: 35em; }
+  #diagram p { text-align: initial; }
+}
 --></style>
 <!--#include virtual="/philosophy/po/categories.translist" -->
 <!--#include virtual="/server/banner.html" -->
@@ -16,24 +22,24 @@
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
 <div class="article reduced-width">
-<h2>Categories of Free and Nonfree Software</h2>
+<h2 class="c">Categories of Free and Nonfree Software</h2>
 
-<!-- GNUN: localize URL /philosophy/category.png -->
-<div id="diagram" class="c" role="figure" aria-labelledby="caption">
-<img src="/philosophy/category.png" alt=" [Categories of software] " />
-      <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>
+<!-- GNUN: localize URL /philosophy/category.svg -->
+<div id="diagram" class="pict" role="figure" aria-labelledby="caption">
+       <object type="image/svg+xml" data="/philosophy/category.svg"
+       title=" [Categories of software] " width="680px" height="auto"></object>
+       <p id="caption">This clickable diagram explains the different
+       categories of software. It is available as <a
+       href="/philosophy/category.svg">SVG</a> and <a
+       href="/philosophy/category.png">PNG</a> images, under the terms
+       of the <a href="https://creativecommons.org/licenses/by-sa/4.0/";
+       rel="license">Creative Commons Attribution-ShareAlike 4.0
+       International</a> license.</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 id="also-read" role="complementary">
+       <p class="announcement">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>
@@ -91,8 +97,7 @@
 
 <h3 id="OpenSource">Open source software</h3>
 
-       <p>
-       The term &ldquo;open source&rdquo; software is used by some
+       <p>The term &ldquo;open source&rdquo; software is used by some
        people to mean more or less the same category as free
        software. It is not exactly the same class of software: they
        accept some licenses that we consider too restrictive, and
@@ -102,6 +107,7 @@
        is open source but not free.  In principle it could happen
        that some free programs are rejected as open source, but
        we don't know if that has ever happened.</p>
+
        <p>We prefer the term &ldquo;<a
         href="/philosophy/open-source-misses-the-point.html">free
        software</a>&rdquo; because it refers to
@@ -458,7 +464,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2021 
Free
+<p>Copyright &copy; 1996-1998, 2001-2005, 2007, 2009-2012, 2015, 2019, 2022 
Free
 Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -469,7 +475,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/09/18 05:31:26 $
+$Date: 2022/11/26 03:59:42 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/categories.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-cn.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/po/categories.zh-cn.po   26 Nov 2022 03:34:08 -0000      1.22
+++ philosophy/po/categories.zh-cn.po   26 Nov 2022 03:59:42 -0000      1.23
@@ -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: 2022-11-23 19:58+0000\n"
 
 #. type: Content of: <title>
 msgid ""