www-commits
[Top][All Lists]
Advanced

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

www philosophy/wassenaar.ko.html philosophy/po/...


From: GNUN
Subject: www philosophy/wassenaar.ko.html philosophy/po/...
Date: Sun, 21 Nov 2021 03:32:37 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/11/21 03:32:37

Modified files:
        philosophy     : wassenaar.ko.html 
        philosophy/po  : wassenaar.ko-diff.html 
        server         : body-include-1.zh-cn.html 
        server/po      : body-include-1.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/wassenaar.ko.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/wassenaar.ko-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-1.zh-cn.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-1.zh-cn.po?cvsroot=www&r1=1.51&r2=1.52

Patches:
Index: philosophy/wassenaar.ko.html
===================================================================
RCS file: /web/www/www/philosophy/wassenaar.ko.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/wassenaar.ko.html        12 Jul 2014 12:59:13 -0000      1.20
+++ philosophy/wassenaar.ko.html        21 Nov 2021 08:32:36 -0000      1.21
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/wassenaar.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/wassenaar.ko.po">
+ https://www.gnu.org/philosophy/po/wassenaar.ko.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/wassenaar.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/wassenaar.ko-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2021-09-22" --><!--#set 
var="ENGLISH_PAGE" value="/philosophy/wassenaar.en.html" -->
 
 <!--#include virtual="/server/header.ko.html" -->
 <!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
 
 <!--#include virtual="/philosophy/po/wassenaar.translist" -->
 <!--#include virtual="/server/banner.ko.html" -->
+<!--#include virtual="/server/outdated.ko.html" -->
 <h2>바세나르 협정</h2>
 
 <p>
@@ -117,7 +123,7 @@
 <p class="unprintable"><!-- timestamp start -->
 최종 수정일:
 
-$Date: 2014/07/12 12:59:13 $
+$Date: 2021/11/21 08:32:36 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/wassenaar.ko-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/wassenaar.ko-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/wassenaar.ko-diff.html        12 Apr 2014 13:59:58 -0000      
1.2
+++ philosophy/po/wassenaar.ko-diff.html        21 Nov 2021 08:32:37 -0000      
1.3
@@ -11,12 +11,20 @@
 </style></head>
 <body><pre>
 &lt;!--#include virtual="/server/header.html" --&gt;
-<span class="inserted"><ins><em>&lt;!-- Parent-Version: 1.77 
--&gt;</em></ins></span>
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from /server/standards/boilerplate.html --&gt;
+&lt;!--#set var="TAGS" value="essays cultural evils" --&gt;
+&lt;!--#set var="DISABLE_TOP_ADDENDUM" value="yes"</em></ins></span> --&gt;
 &lt;title&gt;The Wassenaar Arrangement
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation 
(FSF)&lt;/title&gt;</strong></del></span> <span 
class="inserted"><ins><em>Foundation&lt;/title&gt;</em></ins></span>
+- GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/philosophy/po/wassenaar.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
+<span class="inserted"><ins><em>&lt;!--#include 
virtual="/philosophy/ph-breadcrumb.html" --&gt;
+&lt;!--GNUN: OUT-OF-DATE NOTICE--&gt;
+&lt;!--#include virtual="/server/top-addendum.html" --&gt;
+&lt;div class="article reduced-width"&gt;</em></ins></span>
 &lt;h2&gt;The Wassenaar Arrangement&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div 
class="thin"&gt;&lt;/div&gt;</em></ins></span>
 
 &lt;p&gt;
 Our first information about the new Wassenaar Arrangement came in the
@@ -30,7 +38,8 @@
 Subsequently the actual text of the new version of Wassenaar Arrangement was
 published.  Then we saw that it continues to have an exception that
 seems to cover free software.  (They use the term &ldquo;public
-domain&rdquo;, but they seem to mean something like free software by
+<span class="removed"><del><strong>domain&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>domain,&rdquo;</em></ins></span> but they seem 
to mean something like free software by
 that.)  So the problem seems to have been a false alarm.&lt;/p&gt;
 
 &lt;p&gt;
@@ -46,7 +55,7 @@
 
 &lt;p&gt;
 According to the General Software Notes, entry 2, the agreement does
-not cover software which is in &ldquo;the public domain&rdquo;. This
+not cover software which is in &ldquo;the public <span 
class="removed"><del><strong>domain&rdquo;.</strong></del></span> <span 
class="inserted"><ins><em>domain.&rdquo;</em></ins></span> This
 is defined in the definitions as technology or software which has been
 made available without restrictions upon its further dissemination.
 There is also a statement that copyright by itself does not deny a
@@ -58,9 +67,9 @@
 something that will be clarified at future meetings.&lt;/p&gt;
 
 &lt;p&gt;
-Finnish officials have stated that &lt;cite&gt;&ldquo;nothing will change as
-far as the &ldquo;public domain&rdquo; software and the Dec 3
-Wassenaar Arrangement are concerned.&rdquo;&lt;/cite&gt;&lt;/p&gt;
+Finnish officials have stated that <span 
class="removed"><del><strong>&lt;cite&gt;&ldquo;nothing</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;nothing</em></ins></span> will change as
+far as the <span class="removed"><del><strong>&ldquo;public 
domain&rdquo;</strong></del></span> <span 
class="inserted"><ins><em>&lsquo;public domain&rsquo;</em></ins></span> 
software and the Dec 3
+Wassenaar Arrangement are <span 
class="removed"><del><strong>concerned.&rdquo;&lt;/cite&gt;&lt;/p&gt;</strong></del></span>
 <span class="inserted"><ins><em>concerned.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 In Denmark, we are told, there has been an incident where the Ministry
@@ -72,27 +81,18 @@
 export of free software for encryption by modifying the Wassenaar list
 that related to the definition of software &ldquo;in the public
 domain.&rdquo;&lt;/p&gt;
+<span class="inserted"><ins><em>&lt;/div&gt;</em></ins></span>
 
-<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for id="content", starts 
in the include above --&gt;</em></ins></span>
+&lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
 &lt;!--#include virtual="/server/footer.html" --&gt;
-&lt;div id="footer"&gt;
+&lt;div <span 
class="removed"><del><strong>id="footer"&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="footer" role="contentinfo"&gt;</em></ins></span>
+&lt;div class="unprintable"&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;
-Please</strong></del></span>
-<span class="inserted"><ins><em>&lt;div class="unprintable"&gt;
-
-&lt;p&gt;Please</em></ins></span> send <span 
class="inserted"><ins><em>general</em></ins></span> FSF &amp; GNU inquiries to
-&lt;a <span 
class="removed"><del><strong>href="mailto:gnu@gnu.org"&gt;&lt;em&gt;gnu@gnu.org&lt;/em&gt;&lt;/a&gt;.</strong></del></span>
 <span 
class="inserted"><ins><em>href="mailto:gnu@gnu.org"&gt;&lt;gnu@gnu.org&gt;&lt;/a&gt;.</em></ins></span>
+&lt;p&gt;Please send general FSF &amp; GNU inquiries to
+&lt;a href="mailto:gnu@gnu.org"&gt;&lt;gnu@gnu.org&gt;&lt;/a&gt;.
 There are also &lt;a href="/contact/"&gt;other ways to contact&lt;/a&gt;
-the FSF.
-<span class="removed"><del><strong>&lt;br /&gt;
-Please send broken</strong></del></span>  <span 
class="inserted"><ins><em>Broken</em></ins></span> links and other corrections 
or suggestions <span class="inserted"><ins><em>can be sent</em></ins></span>
-to &lt;a <span 
class="removed"><del><strong>href="mailto:webmasters@gnu.org"&gt;&lt;em&gt;webmasters@gnu.org&lt;/em&gt;&lt;/a&gt;.
-&lt;/p&gt;
-
-&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>href="mailto:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
+the FSF.  Broken links and other corrections or suggestions can be sent
+to &lt;a 
href="mailto:webmasters@gnu.org"&gt;&lt;webmasters@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;&lt;!-- TRANSLATORS: Ignore the original text in this paragraph,
         replace it with the translation of these two:
@@ -103,23 +103,19 @@
         to &lt;a href="mailto:web-translators@gnu.org"&gt;
         &lt;web-translators@gnu.org&gt;&lt;/a&gt;.&lt;/p&gt;
 
-        &lt;p&gt;For information on coordinating and submitting translations of
+        &lt;p&gt;For information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations of
         our web pages, see &lt;a
         href="/server/standards/README.translations.html"&gt;Translations
-        README&lt;/a&gt;. --&gt;</em></ins></span>
+        README&lt;/a&gt;. --&gt;
 Please see the &lt;a
 href="/server/standards/README.translations.html"&gt;Translations
-README&lt;/a&gt; for information on coordinating and submitting translations
-of this <span class="removed"><del><strong>article.
-&lt;/p&gt;
-
-&lt;p&gt;
-Copyright</strong></del></span> <span 
class="inserted"><ins><em>article.&lt;/p&gt;
+README&lt;/a&gt; for information on coordinating and <span 
class="removed"><del><strong>submitting</strong></del></span> <span 
class="inserted"><ins><em>contributing</em></ins></span> translations
+of this article.&lt;/p&gt;
 &lt;/div&gt;
 
 &lt;!-- 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 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND <span class="removed"><del><strong>3.0 
US.</strong></del></span> <span 
class="inserted"><ins><em>4.0.</em></ins></span>  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
@@ -134,30 +130,24 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright</em></ins></span> &copy; 1996, 1997, 1998, <span 
class="removed"><del><strong>2008</strong></del></span> <span 
class="inserted"><ins><em>2008, 2014</em></ins></span> Free Software Foundation,
-<span class="removed"><del><strong>Inc.,
-&lt;/p&gt;
-&lt;address&gt;51 Franklin St, Fifth Floor, Boston, MA 02110, 
USA&lt;/address&gt;
-&lt;p&gt;
-This</strong></del></span>
-<span class="inserted"><ins><em>Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1996, 1997, 1998, 
2008, 2014</strong></del></span> <span class="inserted"><ins><em>1996-1998, 
2021</em></ins></span> Free Software Foundation,
+Inc.&lt;/p&gt;
 
-&lt;p&gt;This</em></ins></span> page is licensed under a &lt;a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative
-Commons Attribution-NoDerivs 3.0 United States <span 
class="removed"><del><strong>License&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>License&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+&lt;p&gt;This page is licensed under a &lt;a rel="license"
+<span 
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/"&gt;Creative</strong></del></span>
+<span 
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United 
States</strong></del></span> <span 
class="inserted"><ins><em>Attribution-NoDerivatives 4.0 
International</em></ins></span> License&lt;/a&gt;.&lt;/p&gt;
 
 &lt;!--#include virtual="/server/bottom-notes.html" --&gt;
 
-<span class="removed"><del><strong>&lt;p&gt;Updated:</strong></del></span>
-
-<span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
+&lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2014/04/12 13:59:58 $
+$Date: 2021/11/21 08:32:37 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: server/body-include-1.zh-cn.html
===================================================================
RCS file: /web/www/www/server/body-include-1.zh-cn.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/body-include-1.zh-cn.html    18 Nov 2021 07:41:04 -0000      1.45
+++ server/body-include-1.zh-cn.html    21 Nov 2021 08:32:37 -0000      1.46
@@ -14,9 +14,7 @@
   <div class="message">
     <p>
       <!--#echo encoding='none' var='fr_link' -->
-Your example can empower users just like you to take important steps towards
-software freedom. Become an FSF associate member by Dec. 31st.  <i>Read more
-&gt;</i>
+你做为榜样会激励象你一æ 
·çš„用户在通往软件自由的道路上迈出重要的一步。请在 12 
月 31 日之前成为 FSF 的准会员。<i>了解更多&gt;</i>
     <!--#echo
       encoding='none' var='a_close' -->
 </p>
@@ -28,7 +26,7 @@
       <!--#set var="d_val" value='<span 
class="percentage">$current_val</span>' -->
 <div class="progress-bar"><!--#echo encoding='none' var="d_val" -->
 </div>
-      <span class="goal">500 Members</span>
+      <span class="goal">500 会员</span>
     </div>
   </div>
 <!-- .progresswidget -->

Index: server/po/body-include-1.zh-cn.po
===================================================================
RCS file: /web/www/www/server/po/body-include-1.zh-cn.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/po/body-include-1.zh-cn.po   21 Nov 2021 08:14:31 -0000      1.51
+++ server/po/body-include-1.zh-cn.po   21 Nov 2021 08:32:37 -0000      1.52
@@ -17,7 +17,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"X-Outdated-Since: 2021-11-18 07:27+0000\n"
 
 #. type: Content of: <div>
 msgid "<a class=\"skip\" href=\"#content\"><b>Skip to main text</b></a>"



reply via email to

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