www-commits
[Top][All Lists]
Advanced

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

www licenses/hessla.zh-cn.html licenses/po/hess...


From: GNUN
Subject: www licenses/hessla.zh-cn.html licenses/po/hess...
Date: Thu, 23 Jul 2020 07:30:17 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/07/23 07:30:17

Modified files:
        licenses       : hessla.zh-cn.html 
        licenses/po    : hessla.zh-cn-en.html hessla.zh-cn.po 
        philosophy     : right-to-read.zh-cn.html 
                         surveillance-vs-democracy.zh-cn.html 
        philosophy/po  : right-to-read.zh-cn-en.html 
                         right-to-read.zh-cn.po 
                         surveillance-vs-democracy.zh-cn-en.html 
                         surveillance-vs-democracy.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/hessla.zh-cn.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/hessla.zh-cn-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/hessla.zh-cn.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/right-to-read.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/surveillance-vs-democracy.zh-cn.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.zh-cn-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.zh-cn.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn-en.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.zh-cn.po?cvsroot=www&r1=1.52&r2=1.53

Patches:
Index: licenses/hessla.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/hessla.zh-cn.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/hessla.zh-cn.html  21 Sep 2019 01:58:54 -0000      1.2
+++ licenses/hessla.zh-cn.html  23 Jul 2020 11:30:16 -0000      1.3
@@ -11,7 +11,7 @@
 <h2>HESSLA 存在的问题</h2>
 
 <p>
-<a href="http://www.hacktivismo.com/about/hessla.php";>Hacktivismo
+<a href="https://directory.fsf.org/wiki/License:HESSLA";>Hacktivismo
 增强源代码软件许可证协议</a>(HESSLA)是一种软件源代ç 
è®¸å¯è¯ï¼Œå®ƒè¯•å›¾åœ¨ä½¿ç”¨å’Œä¿®æ”¹è½¯ä»¶æ–¹é¢æ·»åŠ é“德约束。因
为它限制软件可用的范围,并且大幅
限制修改后软件可以使用的范围,所以它不是自由软件许可证。å
…·æœ‰è®½åˆºæ„ä¹‰çš„结果是,那些最可能同情
 HESSLA 目标的人,却无法在不违背 HESSLA 原则的情况下为遵循 
HESSLA 的软件作贡献。</p>
 <p>
@@ -61,11 +61,11 @@
 <a href="/server/standards/README.translators.html">《译者
指南》</a>。</p>
 </div>
 
-<p>Copyright &copy; 2002, 2008, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2002, 2008, 2014, 2020 Free Software Foundation, Inc.</p>
 
 <p>本页面使用 <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a> 授权。</p>
+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">
@@ -73,12 +73,12 @@
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 <b>审校</b>:<a 
href="mailto:jl-shi@outlook.com";>&lt;石佳乐&gt;</a>,2019。<br></br>
 <b>翻译团队</b>:<a rel="team"
-href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2019,2020。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/09/21 01:58:54 $
+$Date: 2020/07/23 11:30:16 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/hessla.zh-cn-en.html
===================================================================
RCS file: /web/www/www/licenses/po/hessla.zh-cn-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/hessla.zh-cn-en.html    4 Aug 2019 09:58:09 -0000       1.1
+++ licenses/po/hessla.zh-cn-en.html    23 Jul 2020 11:30:17 -0000      1.2
@@ -7,7 +7,7 @@
 <h2>The HESSLA's Problems</h2>
 
 <p>
-The <a href="http://www.hacktivismo.com/about/hessla.php";>Hacktivismo
+The <a href="https://directory.fsf.org/wiki/License:HESSLA";>Hacktivismo
 Enhanced-Source Software License Agreement</a> (HESSLA) is a software
 source license that tries to put restrictions of ethical conduct on
 use and modification of the software.  Because it restricts what jobs
@@ -74,17 +74,17 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2002, 2008, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2002, 2008, 2014, 2020 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+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: 2019/08/04 09:58:09 $
+$Date: 2020/07/23 11:30:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/hessla.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/hessla.zh-cn.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- licenses/po/hessla.zh-cn.po 23 Jul 2020 10:59:23 -0000      1.6
+++ licenses/po/hessla.zh-cn.po 23 Jul 2020 11:30:17 -0000      1.7
@@ -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: 2020-07-22 10:25+0000\n"
 
 #. type: Content of: <title>
 msgid "The HESSLA's Problems - GNU Project - Free Software Foundation"

Index: philosophy/right-to-read.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/right-to-read.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/right-to-read.zh-cn.html 30 Dec 2019 12:08:31 -0000      1.7
+++ philosophy/right-to-read.zh-cn.html 23 Jul 2020 11:30:17 -0000      1.8
@@ -32,6 +32,13 @@
 #AuthorsNote p.emph-box {
    margin: 1em 6%;
 }
+#BadNews li p { text-indent: -.8em; }
+#BadNews li p:before {
+   content: "\021D2";
+   display: inline;
+   position: relative;
+   right: .5em;
+}
 #BadNews p.emph-box {
    margin: 2.5em 6% 1em;
 }
@@ -41,7 +48,7 @@
 #References h3 {
    font-size: 1.2em;
 }
-@media (min-width: 53em) {
+@media (min-width: 55em) {
    #AuthorsNote .columns >
  p:first-child,
     #AuthorsNote li p.inline-block {
@@ -60,7 +67,7 @@
 }-->
 <!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
 <!--
-@media (min-width: 53em) {
+@media (min-width: 55em) {
    .left { padding-left: .75em; }
    .right { padding-right: .75em; }
    }
@@ -278,7 +285,7 @@
 href="/proprietary/malware-kindle-swindle.html">奥威尔式的功能<sup><a
 href="#TransNote3">3</a></sup></a>。有其中任何一个都应该完å…
¨æ‹’绝该产品:</p>
 
-<ul>
+<ul class="no-bullet">
 
<li><p>它监控用户的所有操作:报告用户在看哪本书、哪一页、用户何时高亮了文字以及用户做了什么注记。</p></li>
 
 <li><p>它带有DRM,用来阻止用户分享拷贝。</p></li>
@@ -386,7 +393,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996, 2002, 2007, 2009, 2010, 2014, 2015, 2016, 2019
+<p>Copyright &copy; 1996, 2002, 2007, 2009, 2010, 2014, 2015, 2016, 2019, 2020
 Richard Stallman</p>
 
 <p>本页面使用<a rel="license"
@@ -398,12 +405,12 @@
 
 <!--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>,2017,2019。</div>
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2017,2019,2020。</div>
 
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2019/12/30 12:08:31 $
+$Date: 2020/07/23 11:30:17 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/surveillance-vs-democracy.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/surveillance-vs-democracy.zh-cn.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/surveillance-vs-democracy.zh-cn.html     18 Jul 2020 02:03:26 
-0000      1.20
+++ philosophy/surveillance-vs-democracy.zh-cn.html     23 Jul 2020 11:30:17 
-0000      1.21
@@ -115,8 +115,8 @@
 <h3 class="subheader">对隐私的有力保护必须是技术性的</h3>
 
 <div class="columns">
-<p>电子前线基金会(Electronic Frontier Foundation)和å…
¶ä»–一些组织提议了一组法律原则来<a
-href="https://en.necessaryandproportionate.org/text";>禁止大规模监控的滥用</a>。这些原则åŒ
…括,对报警者严æ 
¼ã€æ˜Žç¡®çš„法律保护;作为结果,这些原则足够来保护民主自由&mdash;如果完å
…¨é‡‡çº³å¹¶æ°¸æ— ä¾‹å¤–地执行。</p>
+<p>电子前线基金会(Electronic Frontier Foundation)和å…
¶ä»–一些组织提议了一组法律原则来 <a
+href="https://necessaryandproportionate.org";>禁止大规模监控的滥用</a>。这些原则åŒ
…括,对报警者严æ 
¼ã€æ˜Žç¡®çš„法律保护;作为结果,这些原则足够来保护民主自由&mdash;&mdash;如果完å
…¨é‡‡çº³å¹¶æ°¸æ— ä¾‹å¤–地执行。</p>
 
 
<p>然而,这种法律保护是不确定的:正如当代历史展示的,法律会被废除(象FISA修正案)、终止或<a
 href="http://www.nytimes.com/2009/04/16/us/16nsa.html";>忽略</a>。</p>
@@ -240,8 +240,10 @@
 
<p>政府要抓到罪犯,它要能够在法庭命令下调查指定的罪案或è€
…
指定的可疑预谋。有了互联网,监听电话的权力会自然延伸到监听互联网。虽然政府很容易滥用该权力,但是它也是å¿
…要的。所幸的是,如果(按我的建议)事å…
ˆå·²ç»ç¦æ­¢äº†æ¡£æ¡ˆæ”¶é›†ï¼Œåœ¨äº‹åŽæŸ¥æ‰¾æŠ¥è­¦è€…就不太可能。</p>
 
 <p>å…
·æœ‰æ”¿åºœç‰¹æƒçš„个人,比如警察,将失去隐私权并被监控。(事实上,警察自己就有å
…³äºŽåšä¼ªè¯çš„专用术语&ldquo;<a
-href="https://en.wikipedia.org/w/index.php?title=Police_perjury&amp;oldid=552608302";>警察伪证罪(testilying)</a>&rdquo;,å›
 ä¸ºè¿™äº‹å„¿ç»å¸¸å‘生,特别是有关抗议者和<a
-href="https://www.themaven.net/pinacnews/";>摄影者</a>时。)加
州的一个城市要求警察全程穿戴录像机,结果是<a
+href="https://en.wikipedia.org/w/index.php?title=Police_perjury&amp;oldid=552608302";>警察伪证罪(testilying)</a>&rdquo;,å›
 ä¸ºè¿™äº‹å„¿ç»å¸¸å‘生,特别是有关抗议者和
+<a
+href="https://web.archive.org/web/20131025014556/http://photographyisnotacrime.com/2013/10/23/jeff-gray-arrested-recording-cops-days-becoming-pinac-partner/";>摄影è€
…</a>
+时。)加州的一个城市要求警察全程穿戴录像机,结果是 <a
 
href="http://www.motherjones.com/kevin-drum/2013/08/ubiquitous-surveillance-police-edition";>警察使用武力的现象减少60%</a>。ACLU(美国å
…¬æ°‘自由联盟)很支持这个做法。</p>
 
 <p><a
@@ -355,7 +357,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2020/07/18 02:03:26 $
+$Date: 2020/07/23 11:30:17 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/right-to-read.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.zh-cn-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/right-to-read.zh-cn-en.html   30 Dec 2019 12:08:33 -0000      
1.7
+++ philosophy/po/right-to-read.zh-cn-en.html   23 Jul 2020 11:30:17 -0000      
1.8
@@ -29,6 +29,13 @@
 #AuthorsNote p.emph-box {
    margin: 1em 6%;
 }
+#BadNews li p { text-indent: -.8em; }
+#BadNews li p:before {
+   content: "\021D2";
+   display: inline;
+   position: relative;
+   right: .5em;
+}
 #BadNews p.emph-box {
    margin: 2.5em 6% 1em;
 }
@@ -38,7 +45,7 @@
 #References h3 {
    font-size: 1.2em;
 }
-@media (min-width: 53em) {
+@media (min-width: 55em) {
    #AuthorsNote .columns > p:first-child,
     #AuthorsNote li p.inline-block {
       margin-top: 0;
@@ -56,7 +63,7 @@
 }-->
 <!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
 <!--
-@media (min-width: 53em) {
+@media (min-width: 55em) {
    .left { padding-left: .75em; }
    .right { padding-right: .75em; }
    }
@@ -440,7 +447,7 @@
 functionalities</a>.  Any one of them calls for rejecting the product
 completely:</p>
 
-<ul>
+<ul class="no-bullet">
 <li><p>It spies on everything the user does: it reports which book the
 user is reading, and which page, and it reports when the user highlights
 text, and any notes the user enters.</p></li>
@@ -559,7 +566,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996, 2002, 2007, 2009, 2010, 2014, 2015, 2016, 2019 
Richard Stallman</p>
+<p>Copyright &copy; 1996, 2002, 2007, 2009, 2010, 2014, 2015, 2016, 2019, 2020 
Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -569,7 +576,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/12/30 12:08:33 $
+$Date: 2020/07/23 11:30:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/right-to-read.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.zh-cn.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/right-to-read.zh-cn.po        23 Jul 2020 10:58:35 -0000      
1.19
+++ philosophy/po/right-to-read.zh-cn.po        23 Jul 2020 11:30:17 -0000      
1.20
@@ -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: 2020-07-23 08:25+0000\n"
 
 #. type: Content of: <title>
 msgid "The Right to Read - GNU Project - Free Software Foundation"

Index: philosophy/po/surveillance-vs-democracy.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.zh-cn-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/surveillance-vs-democracy.zh-cn-en.html       18 Jul 2020 
02:03:26 -0000      1.20
+++ philosophy/po/surveillance-vs-democracy.zh-cn-en.html       23 Jul 2020 
11:30:17 -0000      1.21
@@ -194,7 +194,7 @@
 <div class="columns">
 <p>The Electronic Frontier Foundation and other organizations propose
 a set of legal principles designed to <a
-href="https://en.necessaryandproportionate.org/text";>prevent the
+href="https://necessaryandproportionate.org";>prevent the
 abuses of massive surveillance</a>.  These principles include,
 crucially, explicit legal protection for whistleblowers; as a
 consequence, they would be adequate for protecting democratic
@@ -513,7 +513,8 @@
 police have their own jargon term for perjury,
 &ldquo;<a 
href="https://en.wikipedia.org/w/index.php?title=Police_perjury&amp;oldid=552608302";>testilying</a>,&rdquo;
 since they do it so frequently, particularly about protesters
-and <a href="https://www.themaven.net/pinacnews/";>photographers</a>.)
+and <a 
href="https://web.archive.org/web/20131025014556/http://photographyisnotacrime.com/2013/10/23/jeff-gray-arrested-recording-cops-days-becoming-pinac-partner/";>
+photographers</a>.)
 One city in California that required police to wear video cameras all
 the time
 found <a 
href="http://www.motherjones.com/kevin-drum/2013/08/ubiquitous-surveillance-police-edition";>their
@@ -624,7 +625,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/07/18 02:03:26 $
+$Date: 2020/07/23 11:30:17 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/surveillance-vs-democracy.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.zh-cn.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- philosophy/po/surveillance-vs-democracy.zh-cn.po    23 Jul 2020 10:58:07 
-0000      1.52
+++ philosophy/po/surveillance-vs-democracy.zh-cn.po    23 Jul 2020 11:30:17 
-0000      1.53
@@ -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: 2020-07-22 09:55+0000\n"
 
 #. type: Content of: <title>
 msgid ""



reply via email to

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