www-commits
[Top][All Lists]
Advanced

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

www licenses/license-list.ja.html licenses/po/l...


From: GNUN
Subject: www licenses/license-list.ja.html licenses/po/l...
Date: Tue, 22 Sep 2015 02:27:37 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/09/22 02:27:37

Modified files:
        licenses       : license-list.ja.html 
        licenses/po    : license-list.ja-en.html license-list.ja.po 
        po             : home.ja-en.html 
        proprietary    : proprietary.ja.html 
        proprietary/po : proprietary.ja-en.html proprietary.ja.po 
        server/po      : takeaction.ja-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ja.html?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-en.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.104&r2=1.105
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.ja-en.html?cvsroot=www&r1=1.102&r2=1.103
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary.ja.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.ja-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.ja.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/takeaction.ja-en.html?cvsroot=www&r1=1.69&r2=1.70

Patches:
Index: licenses/license-list.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ja.html,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- licenses/license-list.ja.html       18 Sep 2015 01:00:42 -0000      1.68
+++ licenses/license-list.ja.html       22 Sep 2015 02:27:35 -0000      1.69
@@ -614,6 +614,15 @@
 2.0ライセンスを使ってくだ
さい。それらはより一般的で自由ソフトウェアコミュニティに広く認識されています。</p></dd>
 
 
+<dt><a id="UPL"
+href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>ユニバーサル・パーミッシブ・ライセンス(UPL)</a>
+<span class="anchor-reference-id"> (<a href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>これはゆるい寛容なコピーレフトでない自由ソフトウェアライセンスで、GNU
+GPLと両立します。このライセンスはソフトウェア作品に特許をライセンスする能力を提供します。しかしながら、ゆるいライセンスにあなたの作品をおくå
 ´åˆã®é¸æŠžã¨ã—ては、わたしたちは、なお、Apache
+2.0ライセンスを、特許の裏切りを避けるために推奨します。
+</p></dd>    
+
 <dt><a id="Unlicense"
 href="http://directory.fsf.org/wiki/License:TheUnlicense";>Unlicense</a>
 <span class="anchor-reference-id"> (<a
@@ -1857,7 +1866,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/09/18 01:00:42 $
+$Date: 2015/09/22 02:27:35 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses/po/license-list.ja-en.html 1 Jul 2015 03:58:26 -0000       1.24
+++ licenses/po/license-list.ja-en.html 22 Sep 2015 02:27:35 -0000      1.25
@@ -861,6 +861,18 @@
 common, and widely recognized in the free software community.</p></dd>
 
 
+<dt><a id="UPL" 
href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>
+    Universal Permissive License (UPL)</a>
+    <span class="anchor-reference-id">
+       (<a href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>This is a lax, permissive non-copyleft free software license, compatible
+with the GNU GPL. The license does provide the ability to license
+patents along with the software work, however, we still recommend the
+Apache 2.0 license for avoiding patent treachery when choosing to put
+your work under a lax license.
+</p></dd>    
+
 <dt><a id="Unlicense" 
href="http://directory.fsf.org/wiki/License:TheUnlicense";>
     The Unlicense</a>
     <span class="anchor-reference-id">
@@ -2587,7 +2599,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/07/01 03:58:26 $
+$Date: 2015/09/22 02:27:35 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja.po,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- licenses/po/license-list.ja.po      22 Sep 2015 02:13:12 -0000      1.104
+++ licenses/po/license-list.ja.po      22 Sep 2015 02:27:36 -0000      1.105
@@ -1549,8 +1549,8 @@
 "class=\"anchor-reference-id\"> (<a href=\"#UPL\">#UPL</a>)</span>"
 msgstr ""
 "<a id=\"UPL\" href=\"http://directory.fsf.org/wiki/License:";
-"Universal_Permissive_License\">ユニバーサル・パーミッシブ・ライセンス(UPL)</a>
 <span "
-"class=\"anchor-reference-id\"> (<a href=\"#UPL\">#UPL</a>)</span>"
+"Universal_Permissive_License\">ユニバーサル・パーミッシブ・ライセンス(UPL)</"
+"a> <span class=\"anchor-reference-id\"> (<a href=\"#UPL\">#UPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
@@ -1560,10 +1560,11 @@
 "license for avoiding patent treachery when choosing to put your work under a "
 "lax license."
 msgstr ""
-"これはゆるい寛容なコピーレフトでない自由ソフトウェアライセンスで、GNU
 GPLと両立します。"
-"このライセンスはソフトウェア作品に特許をライセンスする能力を提供します。しかしながら、"
-"ゆるいライセンスにあなたの作品をおくå 
´åˆã®é¸æŠžã¨ã—ては、"
-"わたしたちは、なお、Apache 
2.0ライセンスを、特許の裏切りを避けるために推奨します。"
+"これはゆるい寛容なコピーレフトでない自由ソフトウェアライセンスで、GNU
 GPLと両"
+"立します。このライセンスはソフトウェア作品に特許をライセンスする能力を提供し"
+"ます。しかしながら、ゆるいライセンスにあなたの作品をおくå
 ´åˆã®é¸æŠžã¨ã—ては、"
+"わたしたちは、なお、Apache 
2.0ライセンスを、特許の裏切りを避けるために推奨し"
+"ます。"
 
 #. type: Content of: <dl><dt>
 msgid ""

Index: po/home.ja-en.html
===================================================================
RCS file: /web/www/www/po/home.ja-en.html,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- po/home.ja-en.html  18 Sep 2015 01:00:50 -0000      1.102
+++ po/home.ja-en.html  22 Sep 2015 02:27:36 -0000      1.103
@@ -195,13 +195,11 @@
 href="/server/takeaction.html#unmaint">unmaintained GNU
 package</a>?</strong>
 <span class="gnun-split"></span>
-  <a href="/software/gleem/">gleem</a>,
   <a href="/software/halifax/">halifax</a>,
   <a href="/software/jwhois/">jwhois</a>,
   <a href="/software/metahtml/">metahtml</a>,
   <a href="/software/orgadoc/">orgadoc</a>,
   <a href="/software/polyxmass/">polyxmass</a>,
-  <a href="/software/superopt/">superopt</a>,
   <a href="/software/teximpatient/">teximpatient</a><span 
class="gnun-split"></span>,
 are all <a href="/server/takeaction.html#unmaint">looking for
 maintainers</a>.  Also, these packages are looking for co-maintainers:
@@ -255,7 +253,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/18 01:00:50 $
+$Date: 2015/09/22 02:27:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/proprietary.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary.ja.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- proprietary/proprietary.ja.html     3 Jul 2015 01:59:10 -0000       1.3
+++ proprietary/proprietary.ja.html     22 Sep 2015 02:27:36 -0000      1.4
@@ -35,27 +35,28 @@
 <div class="companies">
 <ul>
   <li><strong>会社あるいは製品の種類</strong></li>
-  <li><a href="/philosophy/malware-apple.html">Appleのマルウェア</a></li>
-  <li><a 
href="/philosophy/malware-microsoft.html">マイクロソフトのマルウェア</a></li>
-  <li><a 
href="/philosophy/malware-mobiles.html">モバイル・デバイスのマルウェア</a></li>
-  <li><a 
href="/philosophy/malware-kindle-swindle.html">アマゾンのインチキンドルのマルウェア</a></li>
+  <li><a 
href="/proprietary/malware-apple.html">Appleのマルウェア</a></li>
+  <li><a 
href="/proprietary/malware-microsoft.html">マイクロソフトのマルウェア</a></li>
+  <li><a 
href="/proprietary/malware-mobiles.html">モバイル・デバイスのマルウェア</a></li>
+  <li><a 
href="/proprietary/malware-kindle-swindle.html">アマゾンのインチキンドルのマルウェア</a></li>
+  <li><a 
href="/proprietary/proprietary-deception.html">人を欺くような会社</a>はその意図をéš
 ã—ます。</li>
 </ul>
 </div>
 
 <div class="malfunctions">
 <ul>
 <li><strong>マルウェアの種類</strong></li>
-<li><a href="/philosophy/proprietary-back-doors.html">バックドア</a></li>
-<li><a 
href="/philosophy/proprietary/proprietary-censorship.html">検閲</a></li>
-<li><a href="/philosophy/proprietary-insecurity.html">危険性</a></li>
-<li><a href="/philosophy/proprietary-sabotage.html">妨害</a></li>
-<li><a href="/philosophy/proprietary-interference.html">干渉</a></li>
-<li><a href="/philosophy/proprietary-surveillance.html">監視</a></li>
+<li><a href="/proprietary/proprietary-back-doors.html">バックドア</a></li>
+<li><a 
href="/proprietary/proprietary/proprietary-censorship.html">検閲</a></li>
+<li><a href="/proprietary/proprietary-insecurity.html">危険性</a></li>
+<li><a href="/proprietary/proprietary-sabotage.html">妨害</a></li>
+<li><a href="/proprietary/proprietary-interference.html">干渉</a></li>
+<li><a href="/proprietary/proprietary-surveillance.html">監視</a></li>
 <li><a
-href="/philosophy/proprietary-drm.html">ディジタル制限管理</a>または&ldquo;DRM&rdquo;は、ユーザが自身のコンピュータのデータで行えることを制限するように設計された機能です。</li>
-<li><a href="/philosophy/proprietary-jails.html">牢獄</a>:
+href="/proprietary/proprietary-drm.html">ディジタル制限管理</a>または&ldquo;DRM&rdquo;は、ユーザが自身のコンピュータのデータで行えることを制限するように設計された機能です。</li>
+<li><a href="/proprietary/proprietary-jails.html">牢獄</a>:
 アプリケーション・プログラム
に対する検閲を強制するシステム。</li>
-<li><a href="/philosophy/proprietary-tyrants.html">暴君</a>:
+<li><a href="/proprietary/proprietary-tyrants.html">暴君</a>:
 製造者
に「オーソライズ」されないオペレーティング・システム
を拒絶するシステム。</li>
 </ul>
 </div>
@@ -131,7 +132,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/07/03 01:59:10 $
+$Date: 2015/09/22 02:27:36 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/proprietary.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.ja-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- proprietary/po/proprietary.ja-en.html       3 Jul 2015 01:59:12 -0000       
1.3
+++ proprietary/po/proprietary.ja-en.html       22 Sep 2015 02:27:37 -0000      
1.4
@@ -41,29 +41,30 @@
 <div class="companies">
 <ul>
   <li><strong>Company or type of product</strong></li>
-  <li><a href="/philosophy/malware-apple.html">Apple Malware</a></li>
-  <li><a href="/philosophy/malware-microsoft.html">Microsoft Malware</a></li>
-  <li><a href="/philosophy/malware-mobiles.html">Malware in mobile 
devices</a></li>
-  <li><a href="/philosophy/malware-kindle-swindle.html">Malware in the Amazon
+  <li><a href="/proprietary/malware-apple.html">Apple Malware</a></li>
+  <li><a href="/proprietary/malware-microsoft.html">Microsoft Malware</a></li>
+  <li><a href="/proprietary/malware-mobiles.html">Malware in mobile 
devices</a></li>
+  <li><a href="/proprietary/malware-kindle-swindle.html">Malware in the Amazon
   Swindle</a></li>
+  <li><a href="/proprietary/proprietary-deception.html">Deceptive 
companies</a> masking their intentions.</li>
 </ul>
 </div>
 
 <div class="malfunctions">
 <ul>
 <li><strong>Type&nbsp;of malware</strong></li>
-<li><a href="/philosophy/proprietary-back-doors.html">Back doors</a></li>
-<li><a 
href="/philosophy/proprietary/proprietary-censorship.html">Censorship</a></li>
-<li><a href="/philosophy/proprietary-insecurity.html">Insecurity</a></li>
-<li><a href="/philosophy/proprietary-sabotage.html">Sabotage</a></li>
-<li><a href="/philosophy/proprietary-interference.html">Interference</a></li>
-<li><a href="/philosophy/proprietary-surveillance.html">Surveillance</a></li>
-<li><a href="/philosophy/proprietary-drm.html">Digital restrictions
+<li><a href="/proprietary/proprietary-back-doors.html">Back doors</a></li>
+<li><a href="/proprietary/proprietary-censorship.html">Censorship</a></li>
+<li><a href="/proprietary/proprietary-insecurity.html">Insecurity</a></li>
+<li><a href="/proprietary/proprietary-sabotage.html">Sabotage</a></li>
+<li><a href="/proprietary/proprietary-interference.html">Interference</a></li>
+<li><a href="/proprietary/proprietary-surveillance.html">Surveillance</a></li>
+<li><a href="/proprietary/proprietary-drm.html">Digital restrictions
     management</a> or &ldquo;DRM&rdquo; means functionalities designed
     to restrict what users can do with the data in their computers.</li>
-<li><a href="/philosophy/proprietary-jails.html">Jails</a>&mdash;systems
+<li><a href="/proprietary/proprietary-jails.html">Jails</a>&mdash;systems
     that impose censorship on application programs.</li>
-<li><a href="/philosophy/proprietary-tyrants.html">Tyrants</a>&mdash;systems
+<li><a href="/proprietary/proprietary-tyrants.html">Tyrants</a>&mdash;systems
     that reject any operating system not &ldquo;authorized&rdquo; by the
     manufacturer.</li>
 </ul>
@@ -134,7 +135,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/07/03 01:59:12 $
+$Date: 2015/09/22 02:27:37 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.ja.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- proprietary/po/proprietary.ja.po    22 Sep 2015 02:13:13 -0000      1.7
+++ proprietary/po/proprietary.ja.po    22 Sep 2015 02:27:37 -0000      1.8
@@ -98,14 +98,15 @@
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/proprietary/malware-microsoft.html\">Microsoft Malware</a>"
 msgstr ""
-"<a 
href=\"/proprietary/malware-microsoft.html\">マイクロソフトのマルウェア</a>"
+"<a 
href=\"/proprietary/malware-microsoft.html\">マイクロソフトのマルウェア</"
+"a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"/proprietary/malware-mobiles.html\">Malware in mobile devices</a>"
 msgstr ""
-"<a 
href=\"/proprietary/malware-mobiles.html\">モバイル・デバイスのマルウェア</"
-"a>"
+"<a 
href=\"/proprietary/malware-mobiles.html\">モバイル・デバイスのマルウェア"
+"</a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -167,8 +168,8 @@
 "<a href=\"/proprietary/proprietary-jails.html\">Jails</a>&mdash;systems that "
 "impose censorship on application programs."
 msgstr ""
-"<a href=\"/proprietary/proprietary-jails.html\">牢獄</a>: 
アプリケーション・プ"
-"ログラムに対する検閲を強制するシステム。"
+"<a href=\"/proprietary/proprietary-jails.html\">牢獄</a>: 
アプリケーション・"
+"プログラムに対する検閲を強制するシステム。"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -176,8 +177,8 @@
 "that reject any operating system not &ldquo;authorized&rdquo; by the "
 "manufacturer."
 msgstr ""
-"<a href=\"/proprietary/proprietary-tyrants.html\">暴君</a>: 製造者
に「オーソラ"
-"イズ」されないオペレーティング・システム
を拒絶するシステム。"
+"<a href=\"/proprietary/proprietary-tyrants.html\">暴君</a>: 製造者
に「オーソ"
+"ライズ」されないオペレーティング・システム
を拒絶するシステム。"
 
 #. type: Content of: <p>
 msgid ""

Index: server/po/takeaction.ja-en.html
===================================================================
RCS file: /web/www/www/server/po/takeaction.ja-en.html,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/po/takeaction.ja-en.html     18 Sep 2015 01:00:52 -0000      1.69
+++ server/po/takeaction.ja-en.html     22 Sep 2015 02:27:37 -0000      1.70
@@ -94,13 +94,11 @@
 <h4 id="unmaint">Take over an unmaintained GNU package</h4>
   <p>These GNU packages are looking for a maintainer:
 <span class="gnun-split"></span>
-  <a href="/software/gleem/">gleem</a>,
   <a href="/software/halifax/">halifax</a>,
   <a href="/software/jwhois/">jwhois</a>,
   <a href="/software/metahtml/">metahtml</a>,
   <a href="/software/orgadoc/">orgadoc</a>,
   <a href="/software/polyxmass/">polyxmass</a>,
-  <a href="/software/superopt/">superopt</a>,
   <a href="/software/teximpatient/">teximpatient</a><span 
class="gnun-split"></span>.
      And these packages are looking for co-maintainers:
 <span class="gnun-split"></span>
@@ -201,7 +199,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/18 01:00:52 $
+$Date: 2015/09/22 02:27:37 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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