www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www distros/free-distros.ja.html distros/po/fre...

From: GNUN
Subject: www distros/free-distros.ja.html distros/po/fre...
Date: Thu, 14 Apr 2016 08:33:51 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     16/04/14 08:33:51

Modified files:
        distros        : free-distros.ja.html 
        distros/po     : free-distros.ja-en.html 
        licenses       : license-list.ja.html 
        licenses/po    : license-list.ja-en.html license-list.ja.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.ja.html?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ja-en.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ja.html?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-en.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.135&r2=1.136

Patches:
Index: distros/free-distros.ja.html
===================================================================
RCS file: /web/www/www/distros/free-distros.ja.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- distros/free-distros.ja.html        3 Feb 2016 09:12:00 -0000       1.61
+++ distros/free-distros.ja.html        14 Apr 2016 08:33:50 -0000      1.62
@@ -54,7 +54,7 @@
    <td>BLAG Linux and GNU, 
FedoraをもとにしたGNU/Linuxディストリビューション</td></tr>
 
  <tr class="even">
-   <td><a href="http://www.dragora.org/en/index.html";>
+   <td><a href="http://dragora.org";>
        <img src="/graphics/distros-dragora.png" alt="Dragora" /></a></td>
    <td>Dragora, 
シンプルであることをコンセプトとした独自のGNU/Linuxディストリビューション</td></tr>
 
@@ -193,7 +193,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc.</p>
 
 <p>このページは<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ja";>Creative
@@ -208,7 +208,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/02/03 09:12:00 $
+$Date: 2016/04/14 08:33:50 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/free-distros.ja-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ja-en.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- distros/po/free-distros.ja-en.html  13 Jul 2015 02:28:34 -0000      1.51
+++ distros/po/free-distros.ja-en.html  14 Apr 2016 08:33:50 -0000      1.52
@@ -84,7 +84,7 @@
    <td>BLAG Linux and GNU, a GNU/Linux distribution based on Fedora.</td></tr>
 
  <tr class="even">
-   <td><a href="http://www.dragora.org/en/index.html";>
+   <td><a href="http://dragora.org";>
        <img src="/graphics/distros-dragora.png" alt="Dragora" /></a></td>
    <td>Dragora, an independent GNU/Linux distribution based on concepts of
        simplicity.</td></tr>
@@ -248,7 +248,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -258,7 +258,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/07/13 02:28:34 $
+$Date: 2016/04/14 08:33:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/license-list.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ja.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- licenses/license-list.ja.html       8 Mar 2016 05:38:17 -0000       1.78
+++ licenses/license-list.ja.html       14 Apr 2016 08:33:51 -0000      1.79
@@ -818,6 +818,10 @@
 href="/copyleft/gpl.html">GNU
 
GPL</a>とは両立しません。これは、GPLの及ぶモジュールとCDDLの及ぶモジュールは合法的に一緒にリンクすることができないことを意味します。このため、CDDLは使わないよう強くお勧めします。</p>
 
+<p>CDDLでライセンスされた作品をGPLでライセンスされた作品と組み合わせるべきではないå
…¸åž‹çš„な事例としては、FSFのステートメント、<a
+href="https://www.fsf.org/licensing/zfs-and-linux";><em>GNU
+GPLの解釈、権利行使と変更、LinuxとZFSの組み合わせについて適用されたとき</em></a>をご覧くã
 ã•ã„。</p>
+
 <p>CDDLに関してもう一つ不幸なことは、それが<a
 
href="/philosophy/not-ipr.html">「知的財産」</a>という言葉を使っているということです。</p></dd>
 
@@ -1890,7 +1894,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/03/08 05:38:17 $
+$Date: 2016/04/14 08:33:51 $
 
 <!-- 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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- licenses/po/license-list.ja-en.html 8 Mar 2016 05:38:17 -0000       1.31
+++ licenses/po/license-list.ja-en.html 14 Apr 2016 08:33:51 -0000      1.32
@@ -1132,9 +1132,14 @@
 cannot legally be linked together.  We urge you not to use the CDDL
 for this reason.</p>
 
+<p>For an illustrative example of why you should not combine
+CDDL-licensed works with the GPL-licensed works, see the FSF's
+statement, <a href="https://www.fsf.org/licensing/zfs-and-linux";>
+<em>Interpreting, enforcing and changing the GNU GPL, as applied to
+combining Linux and ZFS</em></a>.</p>
+
 <p>Also unfortunate in the CDDL is its use of the term &ldquo;<a
-href="/philosophy/not-ipr.html">intellectual
-property</a>&rdquo;.</p></dd>
+href="/philosophy/not-ipr.html">intellectual property</a>&rdquo;.</p></dd>
 
 
 <dt><a id="CPAL" 
href="https://www.socialtext.net/open/cpal_license_in_wikitext";>
@@ -2644,7 +2649,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/03/08 05:38:17 $
+$Date: 2016/04/14 08:33:51 $
 <!-- 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.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- licenses/po/license-list.ja.po      14 Apr 2016 07:29:02 -0000      1.135
+++ licenses/po/license-list.ja.po      14 Apr 2016 08:33:51 -0000      1.136
@@ -2074,10 +2074,10 @@
 "\"https://www.fsf.org/licensing/zfs-and-linux\";> <em>Interpreting, enforcing "
 "and changing the GNU GPL, as applied to combining Linux and ZFS</em></a>."
 msgstr ""
-"CDDLでライセンスされた作品をGPLでライセンスされた作品と組み合わせるべきではない"
-"典型的な事例としては、FSFのステートメント、<a href="
-"\"https://www.fsf.org/licensing/zfs-and-linux\";><em>GNU 
GPLの解釈、権利行使と"
-"変更、LinuxとZFSの組み合わせについて適用されたとき</em></a>をご覧くã
 ã•ã„。"
+"CDDLでライセンスされた作品をGPLでライセンスされた作品と組み合わせるべきではな"
+"い典型的な事例としては、FSFのステートメント、<a 
href=\"https://www.fsf.org/";
+"licensing/zfs-and-linux\"><em>GNU 
GPLの解釈、権利行使と変更、LinuxとZFSの組み"
+"合わせについて適用されたとき</em></a>をご覧ください。"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
reply via email to
[Prev in Thread] Current Thread [Next in Thread]