www distros/common-distros.ja.html distros/po/c...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     15/06/01 07:12:06

Modified files:
        distros        : common-distros.ja.html 
        distros/po     : common-distros.ja-en.html common-distros.ja.po 
        licenses       : license-list.ja.html 
        licenses/old-licenses: gpl-2.0-faq.ja.html 
        licenses/old-licenses/po: gpl-2.0-faq.ja-en.html 
                                  gpl-2.0-faq.ja.po 
        licenses/po    : license-list.ja-en.html license-list.ja.po 
        philosophy     : words-to-avoid.ja.html 
        philosophy/po  : words-to-avoid.ja-en.html words-to-avoid.ja.po 
        proprietary    : proprietary-insecurity.ja.html 
                         proprietary-surveillance.ja.html 
        proprietary/po : proprietary-insecurity.ja-en.html 
                         proprietary-insecurity.ja.po 
                         proprietary-surveillance.ja-en.html 
                         proprietary-surveillance.ja.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.ja.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja-en.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja.po?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ja.html?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/gpl-2.0-faq.ja.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ja-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ja.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.94&r2=1.95
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ja.html?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja-en.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.96&r2=1.97
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-insecurity.ja.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-surveillance.ja.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-insecurity.ja-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-insecurity.ja.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-surveillance.ja-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-surveillance.ja.po?cvsroot=www&r1=1.8&r2=1.9

Patches:
Index: distros/common-distros.ja.html
===================================================================
RCS file: /web/www/www/distros/common-distros.ja.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- distros/common-distros.ja.html      7 May 2015 01:28:13 -0000       1.43
+++ distros/common-distros.ja.html      1 Jun 2015 07:11:57 -0000       1.44
@@ -117,10 +117,6 @@
 
<p>Ubuntuは不自由なソフトウェアの特定のリポジトリを提供していて、Canonical社はいくつかの彼らのé
…
å¸ƒãƒãƒ£ãƒãƒ«ã§ã€Ubuntuの名のもとに、明確に不自由なソフトウェアを奨励し推奨しています。Ubuntuは自由なパッケージã
 
けをインストールするオプションを提供していますが、これは不自由なパッケージをインストールするオプションをも提供していることを意味します。åŠ
 えて、カーネルLinuxの版は、ファーム
ウェア・ブロブを含んでいます。</p>
 
 <p>
-Ubuntuの商標ポリシーはUbuntuのそのままのコピーの商用再é…
å¸ƒã‚’禁止します。これは重要な自由を否定しています。
-</p>
-
-<p>
 2012年10月現在、UbuntuではCanonicalに属するサーバに<a
 
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law";>ユーザの検索についての個人データを送信し</a>、それがAmazon
 
から物品を買う広告を送り返す、というようになっています。これは、厳密に言えば、Ubuntuが自由ソフトウェアかどうかに関係しませんが、ユーザのプライバシの侵害です。また、UbuntuはAmazonから購å
…¥ã™ã‚‹ã“とを奨励していますが、Amazonは<a
@@ -128,6 +124,12 @@
 
 <p>このアドウェアは自由ソフトウェアの開発者
ãŒã€ã‚ã‚‹ãƒ—ãƒ­ã‚°ãƒ©ãƒ ã®æ”¹é€ 
に悪意ある機能を持たせることに執着するまれなケースの一つです。</p>
 
+<p>Ubuntuは<a
+href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>商標を付けて、そのままのコピーの商用再é
…
å¸ƒã‚’認めているようにみえます</a>。商標の除去は改変バージョンにã
 
け要請されています。これは商標について容認できるポリシーです。同じページの、下の方には、曖昧で険悪な文ç«
 
が「Ubuntu特許」についてあり、その特許について攻撃的なのかどうかの詳細は示されてません。</p>
+
+<p>このページは誤解を招く<a 
href="/philosophy/not-ipr.html">&ldquo;intellectual property
+rights&rdquo;</a>の用語を用い、混乱をまき散らしています。これは、商標の法律と特許法といくつかのそのほかの法律が一つの概念的なæž
 
組みに属するという間違った前提です。この用語の使用は例外なく有害で、ほかの誰かがこの用語を使っているとの参ç
…§ã‚’するだ
けで、わたしたちは常にこれを拒否するべきです。しかし、これは、UbuntuのGNU/Linuxディストリビューションとしての主要な問題ではありません。</p>
+
 <h2>そのほかのディストロ</h2>
 
 
<p>ここで、よく知られたあるいは重要なGNU/Linuxではないシステãƒ
 ・ディストロで、自由とはいえないものを論じます。</p>
@@ -196,7 +198,7 @@
 
 <!-- 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 4.0.  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
@@ -213,8 +215,8 @@
 <p>Copyright &copy; 2014, 2015 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-NoDerivs 4.0 International 
License</a>の条件で許諾されます。</p>
 
 <!--#include virtual="/server/bottom-notes.ja.html" -->
 <div class="translators-credits">
@@ -225,7 +227,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/05/07 01:28:13 $
+$Date: 2015/06/01 07:11:57 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/common-distros.ja-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja-en.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- distros/po/common-distros.ja-en.html        7 May 2015 01:28:13 -0000       
1.39
+++ distros/po/common-distros.ja-en.html        1 Jun 2015 07:11:58 -0000       
1.40
@@ -192,11 +192,6 @@
 Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
 
 <p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
-copies of Ubuntu, denying an important freedom.
-</p>
-
-<p>
 As of October 2012, Ubuntu
 <a 
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law";>
 sends personal data about users' searches</a> to a server belonging to
@@ -210,6 +205,23 @@
 developer persists in keeping a malicious feature in its version of a
 program.</p>
 
+<p>Ubuntu <a 
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
+to permit commercial redistribution of exact copies with the
+trademarks</a>; removal of the trademarks is required only for
+modified versions.  That is an acceptable policy for trademarks.  The
+same page, further down, makes a vague and ominous statement about
+&ldquo;Ubuntu patents,&rdquo; without giving enough details to show
+whether that constitutes aggression or not.</p>
+
+<p>That page spreads confusion by using the misleading
+term <a href="/philosophy/not-ipr.html">&ldquo;intellectual property
+rights&rdquo;</a>, which falsely presumes that trademark law and patent law
+and several other laws belong in one single conceptual framework.  Use
+of that term is harmful, without exception, so after making a
+reference to someone else's use of the term, we should always reject
+it.  However, that is not a substantive issue about Ubuntu as a
+GNU/Linux distribution.</p>
+
 <h2>Some Other Distros</h2>
 
 <p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -292,7 +304,7 @@
 
 <!-- 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 4.0.  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
@@ -310,14 +322,14 @@
 <p>Copyright &copy; 2014, 2015 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: 2015/05/07 01:28:13 $
+$Date: 2015/06/01 07:11:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/common-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja.po,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- distros/po/common-distros.ja.po     1 Jun 2015 06:28:14 -0000       1.78
+++ distros/po/common-distros.ja.po     1 Jun 2015 07:11:59 -0000       1.79
@@ -454,11 +454,12 @@
 "ominous statement about &ldquo;Ubuntu patents,&rdquo; without giving enough "
 "details to show whether that constitutes aggression or not."
 msgstr ""
-"Ubuntuは<a 
href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
-"property-policy#your-use-of-ubuntu\">商標を付けて、そのままのコピーの商用再é
…å¸ƒã‚’"
-"認めているようにみえます</a>。商標の除去は改変バージョンにã
 け要請されています。これは"
-"商標について容認できるポリシーです。同じページの、下の方には、曖昧で険悪な文ç«
 が"
-"「Ubuntu特許」についてあり、その特許について攻撃的なのかどうかの詳細は示されてません。"
+"Ubuntuは<a href=\"http://www.ubuntu.com/legal/terms-and-policies/";
+"intellectual-property-policy#your-use-of-ubuntu\">商標を付けて、そのままのコ"
+"ピーの商用再é…
å¸ƒã‚’認めているようにみえます</a>。商標の除去は改変バージョンに"
+"だ
け要請されています。これは商標について容認できるポリシーです。同じページ"
+"ã®ã€ä¸‹ã®æ–¹ã«ã¯ã€æ›–æ˜§ã§é™ºæ‚ªãªæ–‡ç« 
が「Ubuntu特許」についてあり、その特許につい"
+"て攻撃的なのかどうかの詳細は示されてません。"
 
 #. type: Content of: <p>
 msgid ""
@@ -470,12 +471,13 @@
 "use of the term, we should always reject it.  However, that is not a "
 "substantive issue about Ubuntu as a GNU/Linux distribution."
 msgstr ""
-"このページは誤解を招く<a href=\"/"
-"philosophy/not-ipr.html\">&ldquo;intellectual property rights&rdquo;</a>"
-"の用語を用い、混乱をまき散らしています。これは、商標の法律と特許法といくつかのそのほかの法律"
-"ãŒä¸€ã¤ã®æ¦‚å¿µçš„ãªæž 
組みに属するという間違った前提です。この用語の使用は例外なく有害で、"
-"ほかの誰かがこの用語を使っているとの参照をするだ
けで、わたしたちは常にこれを拒否するべきです。"
-"しかし、これは、UbuntuのGNU/Linuxディストリビューションとしての主要な問題ではありません。"
+"このページは誤解を招く<a href=\"/philosophy/not-ipr.html\">&ldquo;"
+"intellectual property 
rights&rdquo;</a>の用語を用い、混乱をまき散らしていま"
+"す。これは、商標の法律と特許法といくつかのそのほかの法律が一つの概念的なæž
 組"
+"みに属するという間違った前提です。この用語の使用は例外なく有害で、ほかの誰か"
+"がこの用語を使っているとの参照をするだ
けで、わたしたちは常にこれを拒否するべ"
+"きです。しかし、これは、UbuntuのGNU/Linuxディストリビューションとしての主要な"
+"問題ではありません。"
 
 #. type: Content of: <h2>
 msgid "Some Other Distros"
@@ -641,8 +643,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International "
-"License</a>の条件で許諾されます。"
+"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International License</a>"
+"の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: licenses/license-list.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ja.html,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- licenses/license-list.ja.html       18 May 2015 08:15:54 -0000      1.65
+++ licenses/license-list.ja.html       1 Jun 2015 07:11:59 -0000       1.66
@@ -414,6 +414,13 @@
 <dd>
 
<p>これは自由ソフトウェアライセンスで、GPLv3と両立します。帰属に関するいくつかの要求を有し、これによってGPLv2と両立しなくなっています。</p></dd>
 
+<dt><a id="HPND"
+href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>歴史的な許可告知と断り書き</a>
+<span class="anchor-reference-id"> (<a href="#HPND">#HPND</a>)</span></dt>
+<dd>
+<p>このライセンスは自由ソフトウェアライセンスでGPLと両立します。これは、<a
 href="#Python1.6a2">Python
+1.6a2とそれより古いバージョン</a>のライセンスと似ています。</p></dd>
+
 
 <dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL";>
 iMatix標準関数ライブラリのライセンス</a> <span 
class="anchor-reference-id"> (<a
@@ -1827,8 +1834,8 @@
 <p>Copyright &copy; 2014, 2015 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-NoDerivs 4.0 International 
License</a>の条件で許諾されます。</p>
 
 <!--#include virtual="/server/bottom-notes.ja.html" -->
 <div class="translators-credits">
@@ -1839,7 +1846,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/05/18 08:15:54 $
+$Date: 2015/06/01 07:11:59 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/old-licenses/gpl-2.0-faq.ja.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/gpl-2.0-faq.ja.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- licenses/old-licenses/gpl-2.0-faq.ja.html   13 Jan 2015 05:31:49 -0000      
1.26
+++ licenses/old-licenses/gpl-2.0-faq.ja.html   1 Jun 2015 07:11:59 -0000       
1.27
@@ -10,6 +10,7 @@
 <!--#include virtual="/server/banner.ja.html" -->
 <h2>GNU GPL v2.0に関してよく聞かれる質問</h2>
 
+<!--#include virtual="/licenses/fsf-licensing.ja.html" -->
 <p>
 このページには、GNU一般å…
¬è¡†ãƒ©ã‚¤ã‚»ãƒ³ã‚¹(GPL)、v2.0に関してよく聞かれる質問への答えがまとめてあります。現行バージョンのGPLのFAQは、<a
 
href="/licenses/gpl-faq.html">こちら</a>です。フリーソフトウェアファウンデーションのそのほかのライセンスについてより詳しく知るには、<a
@@ -1565,11 +1566,12 @@
 href="/server/standards/README.translations.html">翻訳 
README</a>をご覧ください。</p>
 </div>
 
-<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015 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-NoDerivs 4.0 International 
License</a>の条件で許諾されます。</p>
 
 <!--#include virtual="/server/bottom-notes.ja.html" -->
 <div class="translators-credits">
@@ -1580,7 +1582,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/01/13 05:31:49 $
+$Date: 2015/06/01 07:11:59 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/old-licenses/po/gpl-2.0-faq.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ja-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- licenses/old-licenses/po/gpl-2.0-faq.ja-en.html     20 Nov 2014 00:57:22 
-0000      1.19
+++ licenses/old-licenses/po/gpl-2.0-faq.ja-en.html     1 Jun 2015 07:12:00 
-0000       1.20
@@ -5,6 +5,7 @@
 <!--#include virtual="/licenses/old-licenses/po/gpl-2.0-faq.translist" -->
 <!--#include virtual="/server/banner.html" -->
 <h2>Frequently Asked Questions about version 2 of the GNU GPL</h2>
+<!--#include virtual="/licenses/fsf-licensing.html" -->
 
 <p>
 This page contains answers to commonly asked questions about the GNU General
@@ -2456,17 +2457,17 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015 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: 2014/11/20 00:57:22 $
+$Date: 2015/06/01 07:12:00 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/old-licenses/po/gpl-2.0-faq.ja.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ja.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- licenses/old-licenses/po/gpl-2.0-faq.ja.po  1 Jun 2015 06:28:13 -0000       
1.28
+++ licenses/old-licenses/po/gpl-2.0-faq.ja.po  1 Jun 2015 07:12:00 -0000       
1.29
@@ -5070,7 +5070,8 @@
 "Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015 Free Software "
 "Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015 Free Software Foundation, 
Inc."
+"Copyright &copy; 2001, 2006, 2007, 2008, 2014, 2015 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -5079,8 +5080,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International "
-"License</a>の条件で許諾されます。"
+"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International License</a>"
+"の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: licenses/po/license-list.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- licenses/po/license-list.ja-en.html 18 May 2015 08:15:55 -0000      1.22
+++ licenses/po/license-list.ja-en.html 1 Jun 2015 07:12:01 -0000       1.23
@@ -556,6 +556,13 @@
 some attribution requirements which make it incompatible with
 GPLv2.</p></dd>
 
+<dt><a id="HPND" 
href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer";>
+       Historical Permission Notice and Disclaimer </a>
+    <span class="anchor-reference-id">
+       (<a href="#HPND">#HPND</a>)</span></dt>
+<dd>
+<p>This is a free software license and is GPL compatible. It is similar to the 
license of <a href="#Python1.6a2">Python 1.6a2 and earlier 
versions</a>.</p></dd>
+
 
 <dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL";>
        License of the iMatix Standard Function Library</a>
@@ -2309,7 +2316,7 @@
 Commons license&rdquo; is to leave the principal questions about the
 work's licensing unanswered.  When you see such a statement in a work,
 please ask the author to change the work to state clearly and
-visibly <em>which</em>of the Creative Commons license it uses.  And if
+visibly <em>which</em> of the Creative Commons license it uses.  And if
 someone proposes to &ldquo;use a Creative Commons license&rdquo; for a
 certain work, it is vital to ask &ldquo;Which Creative Commons
 license?&rdquo; before proceeding any further.</p></dd>
@@ -2557,14 +2564,14 @@
 <p>Copyright &copy; 2014, 2015 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: 2015/05/18 08:15:55 $
+$Date: 2015/06/01 07:12:01 $
 <!-- 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.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- licenses/po/license-list.ja.po      1 Jun 2015 06:28:12 -0000       1.94
+++ licenses/po/license-list.ja.po      1 Jun 2015 07:12:01 -0000       1.95
@@ -951,18 +951,17 @@
 "\">#HPND</a>)</span>"
 msgstr ""
 "<a id=\"HPND\" href=\"http://directory.fsf.org/wiki/License:";
-"Historical_Permission_Notice_and_Disclaimer\">歴史的な許可告知と断り書き"
-"</a> <span class=\"anchor-reference-id\"> (<a href=\"#HPND"
-"\">#HPND</a>)</span>"
+"Historical_Permission_Notice_and_Disclaimer\">歴史的な許可告知と断り書き</a>
 "
+"<span class=\"anchor-reference-id\"> (<a href=\"#HPND\">#HPND</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license and is GPL compatible. It is similar to the "
 "license of <a href=\"#Python1.6a2\">Python 1.6a2 and earlier versions</a>."
 msgstr ""
-"このライセンスは自由ソフトウェアライセンスでGPLと両立します。これは、"
-"<a href=\"#Python1.6a2\">Python 
1.6a2とそれより古いバージョン</a>のライセンス"
-"と似ています。"
+"このライセンスは自由ソフトウェアライセンスでGPLと両立します。これは、<a
 href="
+"\"#Python1.6a2\">Python 
1.6a2とそれより古いバージョン</a>のライセンスと似てい"
+"ます。"
 
 #. type: Content of: <dl><dt>
 msgid ""
@@ -4909,8 +4908,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International "
-"License</a>の条件で許諾されます。"
+"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International License</a>"
+"の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: philosophy/words-to-avoid.ja.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ja.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- philosophy/words-to-avoid.ja.html   30 Mar 2015 05:57:27 -0000      1.48
+++ philosophy/words-to-avoid.ja.html   1 Jun 2015 07:12:01 -0000       1.49
@@ -189,9 +189,10 @@
 <p>
 ã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«éŒ 
」は、それを批判する人により、デジタル制限管理を指すのに使われます。この用語の問題は、DRMの悪に対してå
…
¬æ­£ã«æ‰±ã†ã“とに失敗していることです。この用語を採用する人はそのように考えないでしょう。</p>
 <p>
-éŒ ã¯å¿…
ずしも圧制的あるいは悪ではありません。あなたはおそらくいくつかのéŒ
 
を持ってその鍵や番号を同様に持っているでしょう。有用であったり厄介であったりすると思いますが、あなたはそれを開けたり閉めたりできるので、それはあなたを支é
…ã™ã‚‹ã‚‚のではありません。</p>
+éŒ ã¯å¿…
ずしも圧制的あるいは悪ではありません。あなたはおそらくいくつかのéŒ
 
を持ってその鍵や番号を同様に持っているでしょう。有用であったり厄介であったりすると思いますが、あなたはそれを開けたり閉めたりできるので、それはあなたを支é
…ã™ã‚‹ã‚‚のではありません。同様に、<a
+href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>暗号化</a>はわたしたちのディジタルなファイルを守ることについて貴重です。これも、あなたがコントロールを持つデジタル鍵のようなものです。</p>
 <p>
-DRMã¯ã»ã‹ã®èª°ã‹ã«ã‚ˆã£ã¦ã‚ãªãŸã«ã‹ã‘ã‚‰ã‚ŒãŸéŒ 
のようなもので、その誰かは、あなたに鍵を与えることを拒否するのです。別の言葉で言えば、それは<em>手éŒ
 </em>ã®ã‚ˆã†ãªã‚‚ã®ã§ã™ã€‚ã§ã™ã‹ã‚‰ã€ã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«éŒ 
ã€ã§ãªãã¦ã€ã“ã‚Œã‚’ã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«æ‰‹éŒ 
」と呼ぶことが明解です。</p>
+DRMã¯ã»ã‹ã®èª°ã‹ã«ã‚ˆã£ã¦ã‚ãªãŸã«ã‹ã‘ã‚‰ã‚ŒãŸéŒ 
のようなもので、その誰かは、あなたに鍵を与えることを拒否するのです。別の言葉で言えば、それは<em>手éŒ
 </em>ã®ã‚ˆã†ãªã‚‚ã®ã§ã™ã€‚ã§ã™ã‹ã‚‰ã€ã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«éŒ 
ã€ã§ãªãã¦ã€ã“ã‚Œã‚’ã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«æ‰‹éŒ 
」と呼ぶことが適切な譬えです。</p>
 <p>
 ã„ãã¤ã‚‚ã®åå¯¾ã‚­ãƒ£ãƒ³ãƒšãƒ¼ãƒ³ãŒã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«éŒ 
」という賢明とは言えない用語を選択してしまっています。ものごとを正しいところに戻すのには、わたしたちは確固として主張し、この間違いを修正すべきです。その主題に賛成するå
 ´åˆã€FSFã¯ã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«éŒ 
」に反対するキャンペーンを支持することはできますが、わたしたちの支持を表明するå
 ´åˆã€é¡•è‘—ã«ã€Œãƒ‡ã‚£ã‚¸ã‚¿ãƒ«æ‰‹éŒ 
」と用語を置き換え、その理由を述べます。</p>
 
@@ -520,7 +521,7 @@
 
 <!-- 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 4.0.  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
@@ -538,8 +539,8 @@
 2009, 2010, 2011, 2012, 2015 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-NoDerivs 4.0 International 
License</a>の条件で許諾されます。</p>
 
 <!--#include virtual="/server/bottom-notes.ja.html" -->
 <div class="translators-credits">
@@ -550,7 +551,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/03/30 05:57:27 $
+$Date: 2015/06/01 07:12:01 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/words-to-avoid.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ja-en.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- philosophy/po/words-to-avoid.ja-en.html     30 Mar 2015 05:57:28 -0000      
1.39
+++ philosophy/po/words-to-avoid.ja-en.html     1 Jun 2015 07:12:02 -0000       
1.40
@@ -421,12 +421,15 @@
 <p>
 Locks are not necessarily oppressive or bad.  You probably own several
 locks, and their keys or codes as well; you may find them useful or
-troublesome, but they don't oppress you, because you are in a position
-to open and close them.</p>
+troublesome, but they don't oppress you, because you can open and
+close them.  Likewise, we
+find <a 
href="http://www.theguardian.com/technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-good-guys-have-keys-to-";>encryption</a>
+invaluable for protecting our digital files.  That too is a kind
+of digital lock that you have control over.</p>
 <p>
 DRM is like a lock placed on you by someone else, who refuses to give
 you the key&mdash;in other words, like <em>handcuffs</em>.  Therefore,
-the clear way to refer to them is &ldquo;digital handcuffs,&rdquo; not
+the proper metaphor for DRM is &ldquo;digital handcuffs,&rdquo; not
 &ldquo;digital locks.&rdquo;</p>
 <p>
 A number of opposition campaigns have chosen the unwise term
@@ -1003,7 +1006,7 @@
 
 <!-- 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 4.0.  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
@@ -1022,14 +1025,14 @@
 2008, 2009, 2010, 2011, 2012, 2015 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: 2015/03/30 05:57:28 $
+$Date: 2015/06/01 07:12:02 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/words-to-avoid.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ja.po,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- philosophy/po/words-to-avoid.ja.po  1 Jun 2015 06:28:12 -0000       1.96
+++ philosophy/po/words-to-avoid.ja.po  1 Jun 2015 07:12:02 -0000       1.97
@@ -831,8 +831,9 @@
 
"ると思いますが、あなたはそれを開けたり閉めたりできるので、それはあなたを支é
…"
 "するものではありません。同様に、<a 
href=\"http://www.theguardian.com/";
 "technology/2015/may/01/encryption-wont-work-if-it-has-a-back-door-only-the-"
-"good-guys-have-keys-to-\">暗号化</a>はわたしたちのディジタルなファイルを守ることについて"
-"貴重です。これも、あなたがコントロールを持つデジタル鍵のようなものです。"
+"good-guys-have-keys-to-\">暗号化</a>はわたしたちのディジタルなファイルを守る"
+"ことについて貴重です。これも、あなたがコントロールを持つデジタル鍵のようなも"
+"のです。"
 
 #. type: Content of: <p>
 msgid ""
@@ -1933,8 +1934,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International "
-"License</a>の条件で許諾されます。"
+"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International License</a>"
+"の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: proprietary/proprietary-insecurity.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-insecurity.ja.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- proprietary/proprietary-insecurity.ja.html  18 May 2015 08:15:56 -0000      
1.2
+++ proprietary/proprietary-insecurity.ja.html  1 Jun 2015 07:12:03 -0000       
1.3
@@ -97,6 +97,12 @@
 <p><a
 
href="http://spritesmods.com/?art=hddhack&amp;page=6";>ディスクドライブの不自由なプログラãƒ
 
によって置き換え可能な不自由なソフトウェア。</a>これは、どんなシステãƒ
 も脆弱にして、é 
‘固な攻撃を受けやすくし、しかもこれは通常の検証では検出できません。</p>
 </li>
+
+<li>
+<p><a
+href="http://phys.org/news/2015-05-app-vulnerability-threatens-millions-users.html";>多くのスマートフォンのアプリは「クラウド」サービスに個人のデータを保管する際、セキュアでない認証方式を使っています。</a>
+これは電子メールアドレス、パスワード、医療情å 
±ã®ã‚ˆã†ãªå€‹äººæƒ…å 
±ã‚’脆弱のままにします。多くのアプリがプロプライエタリなので、どのアプリがリスクがあるのかについて知るのは難しくなっています。</p>
+</li>
 </ul>
 
 <div class="translators-notes">
@@ -137,7 +143,7 @@
 
 <!-- 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 4.0.  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
@@ -154,8 +160,8 @@
 <p>Copyright &copy; 2013, 2015 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-NoDerivs 4.0 International 
License</a>の条件で許諾されます。</p>
 
 <!--#include virtual="/server/bottom-notes.ja.html" -->
 <div class="translators-credits">
@@ -166,7 +172,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/05/18 08:15:56 $
+$Date: 2015/06/01 07:12:03 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-surveillance.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-surveillance.ja.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- proprietary/proprietary-surveillance.ja.html        18 May 2015 08:15:57 
-0000      1.2
+++ proprietary/proprietary-surveillance.ja.html        1 Jun 2015 07:12:04 
-0000       1.3
@@ -423,6 +423,10 @@
       <p>そうこうしている間、LGのTVは<a
 
href="http://www.techdirt.com/articles/20140511/17430627199/lg-will-take-smart-out-your-smart-tv-if-you-dont-agree-to-share-your-viewing-search-data-with-third-parties.shtml";>たくさんのスパイ行為をどちらにせよ行っているのです</a>。</p>
   </li>
+  <li>
+      <p><a
+href="http://arstechnica.com/business/2015/05/verizon-fios-reps-know-what-tv-channels-you-watch/";>Verizonケーブルテレビはどの番組を人ã€
…
が視聴しているかを覗き見します。そして、どれを録画したいかまで調べるのです。</a></p>
+  </li> 
 </ul>
 
 <!-- #SpywareOnTheWeb -->
@@ -521,7 +525,7 @@
 
 <!-- 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 4.0.  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
@@ -538,8 +542,8 @@
 <p>Copyright &copy; 2015 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-NoDerivs 4.0 International 
License</a>の条件で許諾されます。</p>
 
 <!--#include virtual="/server/bottom-notes.ja.html" -->
 <div class="translators-credits">
@@ -550,7 +554,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2015/05/18 08:15:57 $
+$Date: 2015/06/01 07:12:04 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/proprietary-insecurity.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-insecurity.ja-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- proprietary/po/proprietary-insecurity.ja-en.html    18 May 2015 08:15:58 
-0000      1.2
+++ proprietary/po/proprietary-insecurity.ja-en.html    1 Jun 2015 07:12:04 
-0000       1.3
@@ -127,6 +127,14 @@
 program.</a>  This makes any system vulnerable to persistent attacks
 that normal forensics won't detect.</p>
 </li>
+
+<li>
+<p><a 
href="http://phys.org/news/2015-05-app-vulnerability-threatens-millions-users.html";>
+Many smartphone apps use insecure authentication methods when storing
+your personal data in &ldquo;cloud&rdquo; services.</a>
+This leaves personal information like email addresses, passwords, and health 
information vulnerable. Because many
+of these apps are proprietary it makes it hard to impossible to know which 
apps are at risk.</p>
+</li>
 </ul>
 
 </div><!-- for id="content", starts in the include above -->
@@ -161,7 +169,7 @@
 
 <!-- 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 4.0.  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
@@ -179,14 +187,14 @@
 <p>Copyright &copy; 2013, 2015 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: 2015/05/18 08:15:58 $
+$Date: 2015/06/01 07:12:04 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-insecurity.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-insecurity.ja.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- proprietary/po/proprietary-insecurity.ja.po 1 Jun 2015 06:28:11 -0000       
1.10
+++ proprietary/po/proprietary-insecurity.ja.po 1 Jun 2015 07:12:05 -0000       
1.11
@@ -244,10 +244,11 @@
 "impossible to know which apps are at risk."
 msgstr ""
 "<a href=\"http://phys.org/news/2015-05-app-vulnerability-threatens-millions-";
-"users.html\">多くのスマートフォンのアプリは「クラウド」サービスに個人のデータを保管する際、"
-"セキュアでない認証方式を使っています。</a> 
ã“ã‚Œã¯é›»å­ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã€ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã€åŒ»ç™‚æƒ…å ±"
-"のような個人情å 
±ã‚’脆弱のままにします。多くのアプリがプロプライエタリなので、どのアプリが"
-"リスクがあるのかについて知るのは難しくなっています。"
+"users.html\">多くのスマートフォンのアプリは「クラウド」サービスに個人のデータ"
+"を保管する際、セキュアでない認証方式を使っています。</a>
 これは電子メールアド"
+"ãƒ¬ã‚¹ã€ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã€åŒ»ç™‚æƒ…å ±ã®ã‚ˆã†ãªå€‹äººæƒ…å 
±ã‚’脆弱のままにします。多くのアプリ"
+"がプロプライエタリなので、どのアプリがリスクがあるのかについて知るのは難しく"
+"なっています。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -301,8 +302,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International "
-"License</a>の条件で許諾されます。"
+"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International License</a>"
+"の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>

Index: proprietary/po/proprietary-surveillance.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-surveillance.ja-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- proprietary/po/proprietary-surveillance.ja-en.html  18 May 2015 08:16:01 
-0000      1.2
+++ proprietary/po/proprietary-surveillance.ja-en.html  1 Jun 2015 07:12:05 
-0000       1.3
@@ -501,6 +501,9 @@
       <p>Meanwhile, LG TVs
       <a 
href="http://www.techdirt.com/articles/20140511/17430627199/lg-will-take-smart-out-your-smart-tv-if-you-dont-agree-to-share-your-viewing-search-data-with-third-parties.shtml";>
 do lots of spying anyway</a>.</p>
   </li>
+  <li>
+      <p><a 
href="http://arstechnica.com/business/2015/05/verizon-fios-reps-know-what-tv-channels-you-watch/";>Verizon
 cable TV snoops on what programs people watch, and even what they wanted to 
record.</a></p>
+  </li> 
 </ul>
 
 
@@ -607,7 +610,7 @@
 
 <!-- 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 4.0.  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
@@ -625,14 +628,14 @@
 <p>Copyright &copy; 2015 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: 2015/05/18 08:16:01 $
+$Date: 2015/06/01 07:12:05 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-surveillance.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-surveillance.ja.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- proprietary/po/proprietary-surveillance.ja.po       1 Jun 2015 06:28:11 
-0000       1.8
+++ proprietary/po/proprietary-surveillance.ja.po       1 Jun 2015 07:12:06 
-0000       1.9
@@ -933,8 +933,8 @@
 "people watch, and even what they wanted to record.</a>"
 msgstr ""
 "<a href=\"http://arstechnica.com/business/2015/05/verizon-fios-reps-know-";
-"what-tv-channels-you-watch/\">Verizonケーブルテレビはどの番組を人ã€
…が視聴しているか"
-"を覗き見します。そして、どれを録画したいかまで調べるのです。</a>"
+"what-tv-channels-you-watch/\">Verizonケーブルテレビはどの番組を人ã€
…が視聴して"
+"いるかを覗き見します。そして、どれを録画したいかまで調べるのです。</a>"
 
 #. type: Content of: <div><h3>
 msgid "Spyware on the Web"
@@ -1122,8 +1122,8 @@
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
 "このページは<a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International "
-"License</a>の条件で許諾されます。"
+"nd/4.0/\">Creative Commons Attribution-NoDerivs 4.0 International License</a>"
+"の条件で許諾されます。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>