[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www doc/other-free-books.ja.html doc/po/other-f...
From: |
GNUN |
Subject: |
www doc/other-free-books.ja.html doc/po/other-f... |
Date: |
Tue, 29 Dec 2015 07:07:11 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/12/29 07:07:11
Modified files:
doc : other-free-books.ja.html
doc/po : other-free-books.ja-en.html
other-free-books.ja.po
gnu : gnu-linux-faq.ja.html
gnu/po : gnu-linux-faq.ja-en.html gnu-linux-faq.ja.po
graphics : graphics.ja.html
graphics/po : graphics.ja-en.html graphics.ja.po
licenses : bsd.ja.html license-list.ja.html
license-recommendations.ja.html
licenses.ja.html why-not-lgpl.ja.html
licenses/po : bsd.ja-en.html bsd.ja.po
license-list.ja-en.html license-list.ja.po
license-recommendations.ja-en.html
license-recommendations.ja.po
licenses.ja-en.html licenses.ja.po
why-not-lgpl.ja-en.html why-not-lgpl.ja.po
philosophy : essays-and-articles.ja.html
words-to-avoid.ja.html x.ja.html
philosophy/po : essays-and-articles.ja-en.html
self-interest.translist
who-does-that-server-really-serve.ja-en.html
words-to-avoid.ja-en.html words-to-avoid.ja.po
x.ja-en.html x.ja.po
proprietary : proprietary-back-doors.ja.html
proprietary-sabotage.ja.html
proprietary-surveillance.ja.html
proprietary/po : proprietary-back-doors.ja-en.html
proprietary-back-doors.ja.po
proprietary-deception.ru.po
proprietary-deception.translist
proprietary-sabotage.ja-en.html
proprietary-sabotage.ja.po
proprietary-surveillance.ja-en.html
proprietary-surveillance.ja.po
server : body-include-2.ja.html mirror.ja.html
sitemap.ja.html
server/po : body-include-2.ja.po mirror.ja-en.html
sitemap.ja-en.html
Added files:
philosophy : self-interest.ru.html
philosophy/po : self-interest.ru-en.html
proprietary : proprietary-deception.ru.html
proprietary/po : proprietary-deception.ru-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/other-free-books.ja.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/other-free-books.ja-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/other-free-books.ja.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ja.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ja-en.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ja.po?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/graphics.ja.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/graphics.ja-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/graphics/po/graphics.ja.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/bsd.ja.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ja.html?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-recommendations.ja.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ja.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/why-not-lgpl.ja.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.ja-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.ja.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.120&r2=1.121
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ja-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-recommendations.ja.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja-en.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja.po?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/why-not-lgpl.ja-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/why-not-lgpl.ja.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.ja.html?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ja.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.ja.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/self-interest.ru.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ja-en.html?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/self-interest.translist?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/who-does-that-server-really-serve.ja-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja-en.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ja-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ja.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/self-interest.ru-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-back-doors.ja.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-sabotage.ja.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-surveillance.ja.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-deception.ru.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.ja-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.ja.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-deception.ru.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-deception.translist?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.ja-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.ja.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-surveillance.ja-en.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-surveillance.ja.po?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-deception.ru-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/body-include-2.ja.html?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/server/mirror.ja.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ja.html?cvsroot=www&r1=1.245&r2=1.246
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-2.ja.po?cvsroot=www&r1=1.91&r2=1.92
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/mirror.ja-en.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ja-en.html?cvsroot=www&r1=1.102&r2=1.103
Patches:
Index: doc/other-free-books.ja.html
===================================================================
RCS file: /web/www/www/doc/other-free-books.ja.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- doc/other-free-books.ja.html 9 Nov 2015 08:30:32 -0000 1.23
+++ doc/other-free-books.ja.html 29 Dec 2015 07:07:01 -0000 1.24
@@ -327,8 +327,7 @@
</tr>
<tr>
- <td><a href="http://www.cafeshops.com/bartlettpublish.8640017">Programming
from
-the Ground Up</a></td>
+ <td><a href="http://savannah.nongnu.org/projects/pgubook/">å
¨é¨ä¸ããããã°ã©ãã³ã°ãã</a></td>
<td>Jonathan Bartlett</td>
<td>Bartlett Publishing</td>
<td>0975283847</td>
@@ -459,7 +458,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/11/09 08:30:32 $
+$Date: 2015/12/29 07:07:01 $
<!-- timestamp end -->
</p>
Index: doc/po/other-free-books.ja-en.html
===================================================================
RCS file: /web/www/www/doc/po/other-free-books.ja-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- doc/po/other-free-books.ja-en.html 9 Nov 2015 08:30:32 -0000 1.13
+++ doc/po/other-free-books.ja-en.html 29 Dec 2015 07:07:02 -0000 1.14
@@ -334,7 +334,7 @@
</tr>
<tr>
- <td><a href="http://www.cafeshops.com/bartlettpublish.8640017">Programming
from the Ground Up</a></td>
+ <td><a href="http://savannah.nongnu.org/projects/pgubook/">Programming from
the Ground Up</a></td>
<td>Jonathan Bartlett</td>
<td>Bartlett Publishing</td>
<td>0975283847</td>
@@ -464,7 +464,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/11/09 08:30:32 $
+$Date: 2015/12/29 07:07:02 $
<!-- timestamp end -->
</p>
</div>
Index: doc/po/other-free-books.ja.po
===================================================================
RCS file: /web/www/www/doc/po/other-free-books.ja.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- doc/po/other-free-books.ja.po 29 Dec 2015 06:27:05 -0000 1.24
+++ doc/po/other-free-books.ja.po 29 Dec 2015 07:07:02 -0000 1.25
@@ -688,7 +688,8 @@
"<a href=\"http://savannah.nongnu.org/projects/pgubook/\">Programming from "
"the Ground Up</a>"
msgstr ""
-"<a href=\"http://savannah.nongnu.org/projects/pgubook/\">å
¨é¨ä¸ããããã°ã©ãã³ã°ãã</a>"
+"<a href=\"http://savannah.nongnu.org/projects/pgubook/\">å
¨é¨ä¸ããããã°ã©ã"
+"ã³ã°ãã</a>"
#. type: Content of: <table><tr><td>
msgid "Jonathan Bartlett"
Index: gnu/gnu-linux-faq.ja.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ja.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/gnu-linux-faq.ja.html 18 Sep 2015 01:00:41 -0000 1.38
+++ gnu/gnu-linux-faq.ja.html 29 Dec 2015 07:07:03 -0000 1.39
@@ -876,7 +876,7 @@
<p>
å°ãªãã¨ã<a
-href="/philosophy/bsd.html">äºã¤ã®ç°ãªãBSDã©ã¤ã»ã³ã¹</a>ããããã¨ã«æ³¨æãã¦ãã
ãããæ確ã«ããããã«ãã©ã¡ãã§ãããæå®ããã«ãBSDã©ã¤ã»ã³ã¹ãã¨ããç¨èªã使ããªãã§ãã
ããã</p>
+href="/licenses/bsd.html">äºã¤ã®ç°ãªãBSDã©ã¤ã»ã³ã¹</a>ããããã¨ã«æ³¨æãã¦ãã
ãããæ確ã«ããããã«ãã©ã¡ãã§ãããæå®ããã«ãBSDã©ã¤ã»ã³ã¹ãã¨ããç¨èªã使ããªãã§ãã
ããã</p>
</dd>
<dt id="deserve">GNU
@@ -991,7 +991,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/09/18 01:00:41 $
+$Date: 2015/12/29 07:07:03 $
<!-- timestamp end -->
</p>
Index: gnu/po/gnu-linux-faq.ja-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ja-en.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/po/gnu-linux-faq.ja-en.html 1 Jul 2015 03:58:25 -0000 1.32
+++ gnu/po/gnu-linux-faq.ja-en.html 29 Dec 2015 07:07:03 -0000 1.33
@@ -1404,7 +1404,7 @@
credit we deserve.
<p>
-Please note that there are at least <a href="/philosophy/bsd.html">
+Please note that there are at least <a href="/licenses/bsd.html">
two different BSD licenses</a>. For clarity's sake, please don't use
the term “BSD license” without specifying which one.</p>
</dd>
@@ -1527,7 +1527,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/07/01 03:58:25 $
+$Date: 2015/12/29 07:07:03 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/gnu-linux-faq.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ja.po,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- gnu/po/gnu-linux-faq.ja.po 29 Dec 2015 06:27:06 -0000 1.62
+++ gnu/po/gnu-linux-faq.ja.po 29 Dec 2015 07:07:03 -0000 1.63
@@ -3052,9 +3052,9 @@
"different BSD licenses</a>. For clarity's sake, please don't use the term "
"“BSD license” without specifying which one."
msgstr ""
-"å°ãªãã¨ã<a
href=\"/licenses/bsd.html\">äºã¤ã®ç°ãªãBSDã©ã¤ã»ã³ã¹</a>ãã"
-"ããã¨ã«æ³¨æãã¦ãã
ãããæ確ã«ããããã«ãã©ã¡ãã§ãããæå®ããã«ãBSDã©ã¤"
-"ã»ã³ã¹ãã¨ããç¨èªã使ããªãã§ãã ããã"
+"å°ãªãã¨ã<a
href=\"/licenses/bsd.html\">äºã¤ã®ç°ãªãBSDã©ã¤ã»ã³ã¹</a>ããã"
+"ãã¨ã«æ³¨æãã¦ãã
ãããæ確ã«ããããã«ãã©ã¡ãã§ãããæå®ããã«ãBSDã©ã¤ã»"
+"ã³ã¹ãã¨ããç¨èªã使ããªãã§ãã ããã"
#. type: Content of: <dl><dt>
msgid ""
Index: graphics/graphics.ja.html
===================================================================
RCS file: /web/www/www/graphics/graphics.ja.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- graphics/graphics.ja.html 30 Nov 2015 08:29:35 -0000 1.22
+++ graphics/graphics.ja.html 29 Dec 2015 07:07:03 -0000 1.23
@@ -22,9 +22,13 @@
href="mailto:address@hidden"><address@hidden></a>ã¾ã§é£çµ¡ãã
ããã2MBãè¶ãããã¡ã¤ã«ãç§ãã¡ã«éããªãã§ã代ããã«ãã¡ã¤ã«ãã¢ãããã¼ããã¦ãã®ãªã³ã¯ããç¥ãããã
ããããã¡ãã«<a
href="http://libreplanet.org/wiki/Group:Free_Software_Foundation/Ideas#Store_suggestions">ã¢ã¼ãã¯ã¼ã¯ãã©ã使ãããã®ã¢ã¤ãã¢</a>ãã¾ã¨ã¾ã£ã¦ã¾ãã</p>
-<h2>ææ°æ
å ±</h2>
+<h3>ææ°æ
å ±</h3>
<ul>
+ <li>2015å¹´12æ: <a
+href="/graphics/skwetu-gnu-logo.html">Shishalhã®GNUã®ãã´</a>ãSkwetuã«ããã</li>
+ <li>2015å¹´12æ: <a
+href="/graphics/bold-initiative-GNU-head.html">ã¦ã£ã³ã¯ããGNU</a>ããã©ãã»ã¨ã¸ã½ã³ã«ããã</li>
<li>2015å¹´10æ: <a
href="/graphics/wallpapers.html#faif-minimalist-wallpaper">ãèªç±ã®æå³ã§ã®ããªã¼ã
â
æå°æ好家ã®å£ç´</a>ãã«ã¬ãã»ãã¼ãã¼ãã«ããã</li>
@@ -100,7 +104,6 @@
<li><a href="/graphics/gnupumpkin.html">GNUãã¼ã¡ã</a></li>
<li><a
href="/graphics/gnusvgart.html">SVGãã©ã¼ãããã®GNUã¢ã¼ã</a></li>
<li><a href="/graphics/groff-head.html">Groffã®é (å°å·æ©ã¨GNUã®é
)</a></li>
-<li><a href="/graphics/guile-logo.html">Guileã®ãã´</a></li>
<li><a href="/graphics/heckert_gnu.html">太ç·ã®å¥ã®GNUã®é </a></li>
<li><a
href="/graphics/historic-gnu-press.html">GNUåºçã®æ´å²çãªãã®</a></li>
<li><a
href="/graphics/hitflip-gnu.html">Hitflipã®GNUã³ã¤ã³ã¨ç¾¤ã</a></li>
@@ -237,7 +240,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/11/30 08:29:35 $
+$Date: 2015/12/29 07:07:03 $
<!-- timestamp end -->
</p>
Index: graphics/po/graphics.ja-en.html
===================================================================
RCS file: /web/www/www/graphics/po/graphics.ja-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- graphics/po/graphics.ja-en.html 13 Oct 2015 05:57:50 -0000 1.16
+++ graphics/po/graphics.ja-en.html 29 Dec 2015 07:07:03 -0000 1.17
@@ -25,9 +25,11 @@
href="http://libreplanet.org/wiki/Group:Free_Software_Foundation/Ideas#Store_suggestions">
ideas on how we can use artwork</a>.</p>
-<h2>What's new?</h2>
+<h3>What's new?</h3>
<ul>
+ <li>December 2015: <a href="/graphics/skwetu-gnu-logo.html">a Shishalh Gnu
Logo</a> design by Skwetu.</li>
+ <li>December 2015: <a href="/graphics/bold-initiative-GNU-head.html">Winking
GNU</a> by Bravo Edison.</li>
<li>October 2015: <a
href="/graphics/wallpapers.html#faif-minimalist-wallpaper">“Free As In
Freedom” â minimalist wallpaper</a> by Caleb Herbert.</li>
<li>January 2015: <a href="/graphics/gnu-30.html">GNU 30th birthday
@@ -114,7 +116,6 @@
<li><a href="/graphics/gnupumpkin.html">GNU Pumpkin</a></li>
<li><a href="/graphics/gnusvgart.html">GNU Art in svg format</a></li>
<li><a href="/graphics/groff-head.html">Groff Head</a></li>
-<li><a href="/graphics/guile-logo.html">Guile logo</a></li>
<li><a href="/graphics/heckert_gnu.html">Bold alternative GNU Head</a></li>
<li><a href="/graphics/historic-gnu-press.html">Historic GNU press
items</a></li>
<li><a href="/graphics/hitflip-gnu.html">Hitflip's GNU coin and herd</a></li>
@@ -245,7 +246,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/13 05:57:50 $
+$Date: 2015/12/29 07:07:03 $
<!-- timestamp end -->
</p>
</div>
Index: graphics/po/graphics.ja.po
===================================================================
RCS file: /web/www/www/graphics/po/graphics.ja.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- graphics/po/graphics.ja.po 29 Dec 2015 06:27:07 -0000 1.57
+++ graphics/po/graphics.ja.po 29 Dec 2015 07:07:04 -0000 1.58
@@ -75,16 +75,16 @@
"December 2015: <a href=\"/graphics/skwetu-gnu-logo.html\">a Shishalh Gnu "
"Logo</a> design by Skwetu."
msgstr ""
-"2015å¹´12æ: <a
href=\"/graphics/skwetu-gnu-logo.html\">Shishalhã®GNUã®ãã´</a>ã"
-"Skwetuã«ããã"
+"2015å¹´12æ: <a
href=\"/graphics/skwetu-gnu-logo.html\">Shishalhã®GNUã®ãã´</"
+"a>ãSkwetuã«ããã"
#. type: Content of: <ul><li>
msgid ""
"December 2015: <a href=\"/graphics/bold-initiative-GNU-head.html\">Winking "
"GNU</a> by Bravo Edison."
msgstr ""
-"2015å¹´12æ: <a
href=\"/graphics/bold-initiative-GNU-head.html\">ã¦ã£ã³ã¯ããGNU</a>ã"
-"ãã©ãã»ã¨ã¸ã½ã³ã«ããã"
+"2015å¹´12æ: <a
href=\"/graphics/bold-initiative-GNU-head.html\">ã¦ã£ã³ã¯ãã"
+"GNU</a>ããã©ãã»ã¨ã¸ã½ã³ã«ããã"
#. type: Content of: <ul><li>
msgid ""
Index: licenses/bsd.ja.html
===================================================================
RCS file: /web/www/www/licenses/bsd.ja.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/bsd.ja.html 14 Dec 2015 09:00:36 -0000 1.2
+++ licenses/bsd.ja.html 29 Dec 2015 07:07:04 -0000 1.3
@@ -10,6 +10,11 @@
<!--#include virtual="/server/banner.ja.html" -->
<h2>BSDã©ã¤ã»ã³ã¹ã®åé¡</h2>
+<blockquote><p>
+<a
+href="/licenses/license-recommendations.html">ãããªãã®ä½åã®ããã«ã©ã¤ã»ã³ã¹ãé¸æããã«ã¯ã</a>ã§ãä¸è¬çãªã©ã¤ã»ã³ã¹ã®é¸æã«ã¤ãã¦è©³ããè¿°ã¹ã¦ãã¾ãã®ã§ã覧ãã
ããã</p>
+</blockquote>
+
<p>
èªç±ã½ããã¦ã§ã¢ã®ã©ã¤ã»ã³ã¹ã¯ã<a
href="/copyleft/copyleft.html">ã³ãã¼ã¬ãã</a>ã¨<a
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">ã³ãã¼ã¬ããã§ã¯ãªããã®</a>ã®äºç¨®é¡ã«å¤§å¥ãããã¨ãã§ãã¾ãã<a
@@ -142,7 +147,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/12/14 09:00:36 $
+$Date: 2015/12/29 07:07:04 $
<!-- timestamp end -->
</p>
Index: licenses/license-list.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ja.html,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- licenses/license-list.ja.html 13 Oct 2015 07:12:45 -0000 1.71
+++ licenses/license-list.ja.html 29 Dec 2015 07:07:04 -0000 1.72
@@ -771,7 +771,7 @@
href="#apache1">#apache1</a>)</span></dt>
<dd>
<p>ããã¯ãããå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ã宣ä¼æ¡é
ãããã¾ãããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã®ããã¨ä¼¼ããããª<a
-href="/philosophy/bsd.html">ç¾å®çåé¡</a>ãçããGNU
GPLã¨ä¸¡ç«ãã¾ããã</p></dd>
+href="/licenses/bsd.html">ç¾å®çåé¡</a>ãçããGNU
GPLã¨ä¸¡ç«ãã¾ããã</p></dd>
<dt><a id="apsl2" href="http://directory.fsf.org/wiki/License:APSLv2.0">
@@ -801,7 +801,7 @@
<p>ããã¯ãããå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ãé大ãªæ¬
é¥ãããã¾ã:
ãä¸å¿«ãªBSD宣ä¼æ¡é
ãã§ãããã®æ¬
é¥ã¯è´å½çã¨ããã»ã©ã®ãã®ã§ã¯ãªããã½ããã¦ã§ã¢ãä¸èªç±ã«ãã¦ãã¾ãããã§ã¯ããã¾ããããããã<a
-href="/philosophy/bsd.html">ç¾å®çåé¡</a>ãçããGNU
GPLã¨ä¸¡ç«ãã¾ããã</p>
+href="/licenses/bsd.html">ç¾å®çåé¡</a>ãçããGNU
GPLã¨ä¸¡ç«ãã¾ããã</p>
<p>ããããã¡ã¯ãçããããæ¸ãã«ãªãã½ããã¦ã§ã¢ã«ã¯ãªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã使ããªãããå¼·ããå§ããã¾ãããããå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ãæ±ããå
´åã<a
href="#ModifiedBSD">ä¿®æ£BSDã©ã¤ã»ã³ã¹</a>ãX11ã©ã¤ã»ã³ã¹ããããã¯Expatã©ã¤ã»ã³ã¹ã使ãã»ããã¯ããã«è¯ãã§ããããã«è¯ãã®ã¯ãå®ã®ããããã°ã©ã
ã«ã¯ãApache
@@ -1123,7 +1123,7 @@
href="#Zend">#Zend</a>)</span></dt>
<dd>
<p>ãã®ã©ã¤ã»ã³ã¹ã¯PHP4ã®ä¸ã¤ã®é¨åã«ä½¿ããã¦ãã¾ããã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ãGNU
-GPLã¨ã¯ä¸¡ç«ããããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã¨åæ§ã®<a
href="/philosophy/bsd.html">ç¾å®çåé¡</a>ãããã¾ãã</p>
+GPLã¨ã¯ä¸¡ç«ããããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã¨åæ§ã®<a
href="/licenses/bsd.html">ç¾å®çåé¡</a>ãããã¾ãã</p>
<p>ããããã¡ã¯ãçãããæ¸ããã®ã«ã¯ãã®ã©ã¤ã»ã³ã¹ã使ããªããã¨ããå§ããã¾ãã</p></dd>
@@ -1143,7 +1143,7 @@
href="#Zope">#Zope</a>)</span></dt>
<dd>
<p>ããã¯ããããããªãå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã®ããã¨åæ§ã®<a
-href="/philosophy/bsd.html">ç¾å®çåé¡</a>ãæã¡ã<a
href="/licenses/gpl.html">GNU
+href="/licenses/bsd.html">ç¾å®çåé¡</a>ãæã¡ã<a
href="/licenses/gpl.html">GNU
GPL</a>ã¨ä¸¡ç«ãã¾ããã</p>
<p>ããããã¡ã¯ãçããããæ¸ãã«ãªãã½ããã¦ã§ã¢ã«ã¯
@@ -1612,13 +1612,16 @@
<dt><a id="CC-BY-NC" href="?">Creative Commons
Nocommercial(ã©ã®ãã¼ã¸ã§ã³ã§ã)</a> <span
class="anchor-reference-id"> (<a href="#CC-BY-NC">#CC-BY-NC</a>)</span></dt>
<dd>
-<p>ãã®ã©ã¤ã»ã³ã¹ãèªç±ã¨ã¿ãªããã¨ã¯ã§ãã¾ãããè¤åã«å¯¾ãã¦èª²éãããã¨ã«å¶éãããããã§ãããã®ã©ã¤ã»ã³ã¹ã¯ä½¿ããªããã¨ããå§ããã¾ãã</p></dd>
+<p>ãã®ã©ã¤ã»ã³ã¹ãèªç±ã¨ã¿ãªããã¨ã¯ã§ãã¾ãããè¤åã«å¯¾ãã¦èª²éãããã¨ã«å¶éãããããã§ããã§ããããããããã¡ã¯ããã®ã©ã¤ã»ã³ã¹ãææ¸ã«ä½¿ããªããã¨ããå§ããã¾ãã</p>
+
+<p>å ãã¦ãã©ããªç¨®é¡ã®ä½åã«å¯¾ãã¦ãä¸å©çãããã¾ã:
+ããããã®ä½è
ãä¿®æ£çã«ããã¨ããå®éåé¡ã¨ãã¦ãã¹ã¦ã®ä½è
ããåç¨å©ç¨ã®è¨±å¯ãå¾ãã®ã¯é£ãããªãã¾ãã</p></dd>
<dt><a id="CC-BY-ND" href="?">Creative Commons Noderivatives
(ã©ã®ãã¼ã¸ã§ã³ã§ã)</a>
<span class="anchor-reference-id"> (<a
href="#CC-BY-ND">#CC-BY-ND</a>)</span></dt>
<dd>
-<p>ãã®ã©ã¤ã»ã³ã¹ãèªç±ã¨ã¿ãªããã¨ã¯ã§ãã¾ãããå¤æ´ããçãé
å¸ãããã¨ã«å¶éãããããã§ãããã®ã©ã¤ã»ã³ã¹ã¯ä½¿ããªããã¨ããå§ããã¾ãã</p></dd>
+<p>ãã®ã©ã¤ã»ã³ã¹ãèªç±ã¨ã¿ãªããã¨ã¯ã§ãã¾ãããå¤æ´ããçãé
å¸ãããã¨ã«å¶éãããããã§ãããã®ã©ã¤ã»ã³ã¹ãææ¸ã«ä½¿ããªããã¨ããå§ããã¾ãã</p></dd>
</dl>
@@ -1884,7 +1887,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/10/13 07:12:45 $
+$Date: 2015/12/29 07:07:04 $
<!-- timestamp end -->
</p>
Index: licenses/license-recommendations.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-recommendations.ja.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- licenses/license-recommendations.ja.html 13 Jan 2015 05:31:47 -0000
1.18
+++ licenses/license-recommendations.ja.html 29 Dec 2015 07:07:04 -0000
1.19
@@ -11,6 +11,12 @@
<h2>ããªãèªèº«ã®ä½åã«ã©ã¤ã»ã³ã¹ãé¸æããæ¹æ³</h2>
<!--#include virtual="/licenses/fsf-licensing.ja.html" -->
+<blockquote><p>
+ããã©ã¤ã»ã³ã¹ãèªç±ãããã§ãªãããç¥ãã«ã¯ã<a
+href="/licenses/license-list.html">ããããã¡ã®ã©ã¤ã»ã³ã¹ã®ãªã¹ãã®ãã¼ã¸</a>ã¨<a
+href="/philosophy/free-sw.html">èªç±ã½ããã¦ã§ã¢ã®å®ç¾©</a>ãã覧ãã
ããã
+</p></blockquote>
+
<h3 id="intro">ã¯ããã«</h3>
<p>人ã
ã¯ããããã®ããã¸ã§ã¯ãã«ã¨ã£ã¦ãããããã¡ãæ¨å¥¨ãã¦ããã©ã¤ã»ã³ã¹ã®ã©ãã使ãã®ãããããããå°ãã¾ãã以åãããã«ã¤ãã¦å
¬å¼ã«æ¸ãããã¨ãããã¾ããããæ
å
±ã¯ããããããªè«èª¬ãFAQã®é
ç®ãããã¦ã©ã¤ã»ã³ã¹ã«ã¤ãã¦ã®æ³¨éã«æ£ãã°ã£ã¦ãã¾ããããã®å°è«ã§ã¯ããã¹ã¦ã®ãããã®æ
å ±ãéãã¦ä¸ã¤ã«ã¾ã¨ãã人ã
ãå¦ã³ãå¾ã§åç
§ããã®ã容æã¨ãªãããã«ãã¦ãã¾ãã</p>
@@ -147,7 +153,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
@@ -161,11 +167,11 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011, 2013, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2013, 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">
@@ -176,7 +182,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/01/13 05:31:47 $
+$Date: 2015/12/29 07:07:04 $
<!-- timestamp end -->
</p>
Index: licenses/licenses.ja.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ja.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- licenses/licenses.ja.html 18 Sep 2015 01:00:42 -0000 1.42
+++ licenses/licenses.ja.html 29 Dec 2015 07:07:05 -0000 1.43
@@ -29,7 +29,7 @@
href="/licenses/license-recommendations.html">ãã©ã®ããã«ãã¦ããªãèªèº«ã®ä½åã«ã©ã¤ã»ã³ã¹ãé¸æãããã</a>ããããããã¡ã®æ¨å¥¨ããæ¹æ³ã®è©³ç´°ãè¿°ã¹ãç°¡åã«ä½¿ããã¬ã¤ãã¨ãªã£ã¦ãã¾ããåã«æ©è¦åç
§ãªã¹ãã欲ããå ´åãããããã¡ã®<a
href="/licenses/recommended-copylefts.html">æ¨å¥¨ããã³ãã¼ã¬ããã»ã©ã¤ã»ã³ã¹</a>ã示ãããã¼ã¸ãããã¾ãã</p>
-<p>ã¾ãã<a
href="/philosophy/bsd.html">BSDã®ã©ã¤ã»ã³ã¹ã®åé¡</a>ãè«ãããã¼ã¸ãããã¾ãã</p>
+<p>ã¾ãã<a
href="/licenses/bsd.html">BSDã®ã©ã¤ã»ã³ã¹ã®åé¡</a>ãè«ãããã¼ã¸ãããã¾ãã</p>
<h3>ã©ã¤ã»ã³ã¹ã®è©ä¾¡</h3>
@@ -357,7 +357,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/09/18 01:00:42 $
+$Date: 2015/12/29 07:07:05 $
<!-- timestamp end -->
</p>
Index: licenses/why-not-lgpl.ja.html
===================================================================
RCS file: /web/www/www/licenses/why-not-lgpl.ja.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- licenses/why-not-lgpl.ja.html 13 Jan 2015 05:31:48 -0000 1.28
+++ licenses/why-not-lgpl.ja.html 29 Dec 2015 07:07:05 -0000 1.29
@@ -10,6 +10,11 @@
<!--#include virtual="/server/banner.ja.html" -->
<h2>ããªãã®æ¬¡åã®ã©ã¤ãã©ãªã«ã¯å£çGPLã使ãã¹ãã§ãªãçç±</h2>
+<blockquote><p>
+<a
+href="/licenses/license-recommendations.html">ãããªãã®ä½åã®ããã«ã©ã¤ã»ã³ã¹ãé¸æããã«ã¯ã</a>ã§ãä¸è¬çãªã©ã¤ã»ã³ã¹ã®é¸æã«ã¤ãã¦è©³ããè¿°ã¹ã¦ãã¾ãã®ã§ã覧ãã
ããã</p>
+</blockquote>
+
<p>
GNUããã¸ã§ã¯ããã©ã¤ãã©ãªã«ä½¿ç¨ãã¦ããã©ã¤ã»ã³ã¹ã¯ã主ãªãã®ã¨ãã¦äºã¤ããã¾ããä¸ã¤ã¯GNUå£çGPLã§ãããä¸ã¤ã¯ãµã¤ãã®GNU
GPLã§ããã©ã¤ã»ã³ã¹ã®é¸æã¯å¤§ããªéããããããã¾ããããªãã¡ãå£çGPLã使ãã¨ããã®ã©ã¤ãã©ãªããããã©ã¤ã¨ã¿ãªãªããã°ã©ã
ã§ä½¿ããã¨ã許å¯ãããã¨ã«ãªããä¸æ¹ãµã¤ãã®GPLã使ãã°ããã®ã©ã¤ãã©ãªã¯èªç±ãªããã°ã©ã
ã§ã®ã¿å©ç¨å¯è½ã¨ãªãã®ã§ãã</p>
@@ -70,7 +75,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
@@ -84,11 +89,11 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1999, 2007, 2013, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 1999, 2007, 2013, 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">
@@ -99,7 +104,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/01/13 05:31:48 $
+$Date: 2015/12/29 07:07:05 $
<!-- timestamp end -->
</p>
Index: licenses/po/bsd.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/bsd.ja-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/po/bsd.ja-en.html 14 Dec 2015 09:00:37 -0000 1.2
+++ licenses/po/bsd.ja-en.html 29 Dec 2015 07:07:05 -0000 1.3
@@ -6,11 +6,17 @@
<!--#include virtual="/server/banner.html" -->
<h2>The BSD License Problem</h2>
+<blockquote><p>
+See <a href="/licenses/license-recommendations.html">“How to
+choose a license for your own work”</a> for general
+recommendations about choosing a license for your work.</p>
+</blockquote>
+
<p>
The two major categories of free software license are <a
href="/copyleft/copyleft.html">copyleft</a> and <a
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">
- non-copyleft </a>. <a
+ non-copyleft</a>. <a
href="/licenses/license-list.html#GPLCompatibleLicenses">Copyleft
licenses</a> such as the <a href="/licenses/gpl.html">GNU
GPL</a> insist that modified versions of the program must be
@@ -192,7 +198,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/12/14 09:00:37 $
+$Date: 2015/12/29 07:07:05 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/bsd.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/bsd.ja.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- licenses/po/bsd.ja.po 29 Dec 2015 06:27:07 -0000 1.5
+++ licenses/po/bsd.ja.po 29 Dec 2015 07:07:05 -0000 1.6
@@ -31,9 +31,9 @@
"a license for your own work”</a> for general recommendations about "
"choosing a license for your work."
msgstr ""
-"<a
href=\"/licenses/license-recommendations.html\">ãããªãã®ä½åã®ããã«"
-"ã©ã¤ã»ã³ã¹ãé¸æããã«ã¯ã</a>ã§ãä¸è¬çãªã©ã¤ã»ã³ã¹ã®é¸æã«ã¤ãã¦è©³ããè¿°ã¹ã¦ãã¾ãã®ã§"
-"ã覧ãã ããã"
+"<a
href=\"/licenses/license-recommendations.html\">ãããªãã®ä½åã®ããã«ã©ã¤"
+"ã»ã³ã¹ãé¸æããã«ã¯ã</a>ã§ãä¸è¬çãªã©ã¤ã»ã³ã¹ã®é¸æã«ã¤ãã¦è©³ããè¿°ã¹ã¦ã"
+"ã¾ãã®ã§ã覧ãã ããã"
#. type: Content of: <p>
msgid ""
Index: licenses/po/license-list.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- licenses/po/license-list.ja-en.html 13 Oct 2015 07:12:46 -0000 1.27
+++ licenses/po/license-list.ja-en.html 29 Dec 2015 07:07:05 -0000 1.28
@@ -1067,7 +1067,7 @@
<dd>
<p>This is a lax, permissive non-copyleft free software license with an
advertising clause. This creates <a
-href="/philosophy/bsd.html">practical problems</a> like
+href="/licenses/bsd.html">practical problems</a> like
those of the original BSD license, including incompatibility with the GNU
GPL.</p></dd>
@@ -1106,7 +1106,7 @@
a serious flaw: the “obnoxious BSD advertising clause”. The
flaw is not fatal; that is, it does not render the software nonfree.
But it does cause <a
-href="/philosophy/bsd.html">practical problems</a>,
+href="/licenses/bsd.html">practical problems</a>,
including incompatibility with the GNU GPL.</p>
<p>We urge you not to use the original BSD license for software you
@@ -1580,7 +1580,7 @@
<dd>
<p>This license is used by one part of PHP4. It is a non-copyleft free
software license which is incompatible with the GNU GPL, and has <a
-href="/philosophy/bsd.html">practical problems</a>
+href="/licenses/bsd.html">practical problems</a>
like those of the original BSD license.</p>
<p>We recommend that you not use this license for anything you write.</p></dd>
@@ -1605,7 +1605,7 @@
(<a href="#Zope">#Zope</a>)</span></dt>
<dd>
<p>This is a lax, fairly permissive non-copyleft free software
-license with <a href="/philosophy/bsd.html">practical
+license with <a href="/licenses/bsd.html">practical
problems</a> like those of the original BSD license, including
incompatibility with the <a
href="/licenses/gpl.html">GNU GPL</a>.</p>
@@ -2277,8 +2277,13 @@
<span class="anchor-reference-id">
(<a href="#CC-BY-NC">#CC-BY-NC</a>)</span></dt>
<dd>
-<p>This license does not qualify as free, because there are restrictions on
-charging money for copies. We recommend you do not use this license.</p></dd>
+<p>This license does not qualify as free, because there are
+restrictions on charging money for copies. Thus, we recommend you do
+not use this license for documentation.</p>
+
+<p>In addition, it has a drawback for any sort of work: when a
+modified version has many authors, in practice getting permission for
+commercial use from all of them would become infeasible.</p></dd>
<dt><a id="CC-BY-ND" href="?">Creative Commons Noderivatives, any version</a>
<span class="anchor-reference-id">
@@ -2286,7 +2291,7 @@
<dd>
<p>This license does not qualify as free, because there are
restrictions on distributing modified versions. We recommend you do
-not use this license.</p></dd>
+not use this license for documentation.</p></dd>
</dl> <!-- end class="red" -->
@@ -2633,7 +2638,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/13 07:12:46 $
+$Date: 2015/12/29 07:07:05 $
<!-- 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.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- licenses/po/license-list.ja.po 29 Dec 2015 06:27:08 -0000 1.120
+++ licenses/po/license-list.ja.po 29 Dec 2015 07:07:05 -0000 1.121
@@ -1947,8 +1947,8 @@
"incompatibility with the GNU GPL."
msgstr ""
"ããã¯ãããå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ã宣ä¼æ¡é
ã"
-"ããã¾ãããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã®ããã¨ä¼¼ããããª<a
href=\"/licenses/"
-"bsd.html\">ç¾å®çåé¡</a>ãçããGNU GPLã¨ä¸¡ç«ãã¾ããã"
+"ããã¾ãããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã®ããã¨ä¼¼ããããª<a
href=\"/licenses/bsd."
+"html\">ç¾å®çåé¡</a>ãçããGNU GPLã¨ä¸¡ç«ãã¾ããã"
#. type: Content of: <dl><dt>
msgid ""
@@ -3030,8 +3030,8 @@
"gpl.html\">GNU GPL</a>."
msgstr ""
"ããã¯ããããããªãå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ããª"
-"ãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã®ããã¨åæ§ã®<a
href=\"/licenses/bsd.html\">ç¾å®ç"
-"åé¡</a>ãæã¡ã<a href=\"/licenses/gpl.html\">GNU
GPL</a>ã¨ä¸¡ç«ãã¾ããã"
+"ãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã®ããã¨åæ§ã®<a
href=\"/licenses/bsd.html\">ç¾å®çå"
+"é¡</a>ãæã¡ã<a href=\"/licenses/gpl.html\">GNU
GPL</a>ã¨ä¸¡ç«ãã¾ããã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4409,7 +4409,8 @@
"for documentation."
msgstr ""
"ãã®ã©ã¤ã»ã³ã¹ãèªç±ã¨ã¿ãªããã¨ã¯ã§ãã¾ãããè¤åã«å¯¾ãã¦èª²éãããã¨ã«å¶é"
-"ãããããã§ããã§ããããããããã¡ã¯ããã®ã©ã¤ã»ã³ã¹ãææ¸ã«ä½¿ããªããã¨ããå§ããã¾ãã"
+"ãããããã§ããã§ããããããããã¡ã¯ããã®ã©ã¤ã»ã³ã¹ãææ¸ã«ä½¿ããªããã¨ã"
+"ãå§ããã¾ãã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4417,8 +4418,9 @@
"has many authors, in practice getting permission for commercial use from all "
"of them would become infeasible."
msgstr ""
-"å ãã¦ãã©ããªç¨®é¡ã®ä½åã«å¯¾ãã¦ãä¸å©çãããã¾ã:
ããããã®ä½è
ãä¿®æ£çã«ããã¨ãã"
-"å®éåé¡ã¨ãã¦ãã¹ã¦ã®ä½è
ããåç¨å©ç¨ã®è¨±å¯ãå¾ãã®ã¯é£ãããªãã¾ãã"
+"å ãã¦ãã©ããªç¨®é¡ã®ä½åã«å¯¾ãã¦ãä¸å©çãããã¾ã:
ããããã®ä½è
ãä¿®æ£çã«"
+"ããã¨ããå®éåé¡ã¨ãã¦ãã¹ã¦ã®ä½è
ããåç¨å©ç¨ã®è¨±å¯ãå¾ãã®ã¯é£ãããªãã¾"
+"ãã"
#. type: Content of: <dl><dt>
msgid ""
Index: licenses/po/license-recommendations.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ja-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- licenses/po/license-recommendations.ja-en.html 18 Nov 2014 06:29:15
-0000 1.13
+++ licenses/po/license-recommendations.ja-en.html 29 Dec 2015 07:07:06
-0000 1.14
@@ -8,6 +8,12 @@
<!--#include virtual="/licenses/fsf-licensing.html" -->
+<blockquote><p>
+To see whether a given license is free or not,
+see <a href="/licenses/license-list.html">our license list page</a>
+and the <a href="/philosophy/free-sw.html">definition of free software</a>.
+</p></blockquote>
+
<h3 id="intro">Introduction</h3>
<p>People often ask us what license we recommend they use for their
@@ -251,7 +257,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
@@ -266,17 +272,17 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2011, 2013, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2013, 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/18 06:29:15 $
+$Date: 2015/12/29 07:07:06 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/license-recommendations.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/license-recommendations.ja.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses/po/license-recommendations.ja.po 29 Dec 2015 06:27:08 -0000
1.24
+++ licenses/po/license-recommendations.ja.po 29 Dec 2015 07:07:06 -0000
1.25
@@ -33,9 +33,9 @@
"license-list.html\">our license list page</a> and the <a href=\"/philosophy/"
"free-sw.html\">definition of free software</a>."
msgstr ""
-"ããã©ã¤ã»ã³ã¹ãèªç±ãããã§ãªãããç¥ãã«ã¯ã<a
href=\"/licenses/"
-"license-list.html\">ããããã¡ã®ã©ã¤ã»ã³ã¹ã®ãªã¹ãã®ãã¼ã¸</a>ã¨<a
href=\"/philosophy/"
-"free-sw.html\">èªç±ã½ããã¦ã§ã¢ã®å®ç¾©</a>ãã覧ãã ããã"
+"ããã©ã¤ã»ã³ã¹ãèªç±ãããã§ãªãããç¥ãã«ã¯ã<a
href=\"/licenses/license-"
+"list.html\">ããããã¡ã®ã©ã¤ã»ã³ã¹ã®ãªã¹ãã®ãã¼ã¸</a>ã¨<a
href=\"/"
+"philosophy/free-sw.html\">èªç±ã½ããã¦ã§ã¢ã®å®ç¾©</a>ãã覧ãã
ããã"
#. type: Content of: <h3>
msgid "Introduction"
Index: licenses/po/licenses.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ja-en.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- licenses/po/licenses.ja-en.html 1 Jul 2015 03:58:26 -0000 1.28
+++ licenses/po/licenses.ja-en.html 29 Dec 2015 07:07:06 -0000 1.29
@@ -36,7 +36,7 @@
our <a href="/licenses/recommended-copylefts.html">recommended
copyleft licenses</a>.</p>
-<p>We also have a page that discusses <a href="/philosophy/bsd.html">the BSD
License Problem</a>.</p>
+<p>We also have a page that discusses <a href="/licenses/bsd.html">the BSD
License Problem</a>.</p>
<h3>Evaluating Licenses</h3>
@@ -469,7 +469,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/07/01 03:58:26 $
+$Date: 2015/12/29 07:07:06 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/licenses.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ja.po,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- licenses/po/licenses.ja.po 29 Dec 2015 06:27:08 -0000 1.53
+++ licenses/po/licenses.ja.po 29 Dec 2015 07:07:06 -0000 1.54
@@ -80,8 +80,8 @@
"We also have a page that discusses <a href=\"/licenses/bsd.html\">the BSD "
"License Problem</a>."
msgstr ""
-"ã¾ãã<a
href=\"/licenses/bsd.html\">BSDã®ã©ã¤ã»ã³ã¹ã®åé¡</a>ãè«ãããã¼"
-"ã¸ãããã¾ãã"
+"ã¾ãã<a
href=\"/licenses/bsd.html\">BSDã®ã©ã¤ã»ã³ã¹ã®åé¡</a>ãè«ãããã¼ã¸"
+"ãããã¾ãã"
#. type: Content of: <h3>
msgid "Evaluating Licenses"
Index: licenses/po/why-not-lgpl.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/why-not-lgpl.ja-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- licenses/po/why-not-lgpl.ja-en.html 28 Apr 2014 07:59:18 -0000 1.19
+++ licenses/po/why-not-lgpl.ja-en.html 29 Dec 2015 07:07:06 -0000 1.20
@@ -6,6 +6,12 @@
<!--#include virtual="/server/banner.html" -->
<h2>Why you shouldn't use the Lesser GPL for your next library</h2>
+<blockquote><p>
+See <a href="/licenses/license-recommendations.html">“How to
+choose a license for your own work”</a> for general
+recommendations about choosing a license for your work.</p>
+</blockquote>
+
<p>
The GNU Project has two principal licenses to use for libraries. One
is the GNU Lesser GPL; the other is the ordinary GNU GPL. The choice
@@ -106,7 +112,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
@@ -121,17 +127,17 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1999, 2007, 2013, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 1999, 2007, 2013, 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/04/28 07:59:18 $
+$Date: 2015/12/29 07:07:06 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/why-not-lgpl.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/why-not-lgpl.ja.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- licenses/po/why-not-lgpl.ja.po 29 Dec 2015 06:27:09 -0000 1.17
+++ licenses/po/why-not-lgpl.ja.po 29 Dec 2015 07:07:06 -0000 1.18
@@ -34,9 +34,9 @@
"a license for your own work”</a> for general recommendations about "
"choosing a license for your work."
msgstr ""
-"<a
href=\"/licenses/license-recommendations.html\">ãããªãã®ä½åã®ããã«"
-"ã©ã¤ã»ã³ã¹ãé¸æããã«ã¯ã</a>ã§ãä¸è¬çãªã©ã¤ã»ã³ã¹ã®é¸æã«ã¤ãã¦è©³ããè¿°ã¹ã¦ãã¾ãã®ã§"
-"ã覧ãã ããã"
+"<a
href=\"/licenses/license-recommendations.html\">ãããªãã®ä½åã®ããã«ã©ã¤"
+"ã»ã³ã¹ãé¸æããã«ã¯ã</a>ã§ãä¸è¬çãªã©ã¤ã»ã³ã¹ã®é¸æã«ã¤ãã¦è©³ããè¿°ã¹ã¦ã"
+"ã¾ãã®ã§ã覧ãã ããã"
#. type: Content of: <p>
msgid ""
@@ -230,7 +230,8 @@
#. type: Content of: <div><p>
msgid ""
"Copyright © 1999, 2007, 2013, 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 1999, 2007, 2013, 2014, 2015 Free Software
Foundation, Inc."
+msgstr ""
+"Copyright © 1999, 2007, 2013, 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
Index: philosophy/essays-and-articles.ja.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.ja.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- philosophy/essays-and-articles.ja.html 30 Nov 2015 08:29:36 -0000
1.61
+++ philosophy/essays-and-articles.ja.html 29 Dec 2015 07:07:06 -0000
1.62
@@ -105,7 +105,7 @@
<li><a
href="http://www.fsf.org/blogs/licensing/20050211.html">æ¤é²ã®å«å¦¬ã¨ã©ã¤ã»ã³ã·ã³ã°</a></li>
<li><a href="/philosophy/x.html">Xã¦ã£ã³ãã¦ã·ã¹ãã ã®ç½ </a></li>
<li><a href="/philosophy/apsl.html">Appleã©ã¤ã»ã³ã¹ã®åé¡</a></li>
- <li><a href="/philosophy/bsd.html">BSDã©ã¤ã»ã³ã¹ã®åé¡</a></li>
+ <li><a href="/licenses/bsd.html">BSDã©ã¤ã»ã³ã¹ã®åé¡</a></li>
<li><a
href="/philosophy/netscape-npl.html">Netscapeãããªãã¯ã»ã©ã¤ã»ã³ã¹ã«ã¯æ·±å»ãªåé¡ããã</a>ã<a
href="/philosophy/netscape-npl-old.html">
ãã®å°è«ã®å¤ããã¼ã¸ã§ã³</a>ãããã¾ãã</li>
<li><a
href="/philosophy/udi.html">èªç±ã½ããã¦ã§ã¢éåã¨UDI</a></li>
@@ -499,7 +499,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/11/30 08:29:36 $
+$Date: 2015/12/29 07:07:06 $
<!-- timestamp end -->
</p>
Index: philosophy/words-to-avoid.ja.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ja.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- philosophy/words-to-avoid.ja.html 30 Nov 2015 08:29:37 -0000 1.58
+++ philosophy/words-to-avoid.ja.html 29 Dec 2015 07:07:07 -0000 1.59
@@ -55,7 +55,7 @@
<h3 id="BSD-style">ãBSDã¹ã¿ã¤ã«ã</h3>
<p>
ãBSDã¹ã¿ã¤ã«ã»ã©ã¤ã»ã³ã¹ãã¨ãã表ç¾ã¯ãæ··åãçã¿ã¾ãããªããªããããã¯ã<a
-href="/philosophy/bsd.html">éè¦ãªéãã®ããã©ã¤ã»ã³ã¹ãã²ã¨ã¾ã¨ãã«ãã¦ãã</a>ããã§ãããã¨ãã°ã宣ä¼æ¡é
ã®ãããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã¯GNUä¸è¬å
¬è¡ã©ã¤ã»ã³ã¹ã¨ä¸¡ç«ãã¾ããããä¿®æ£BSDã©ã¤ã»ã³ã¹ã¯GPLã¨ä¸¡ç«ãã¾ãã</p>
+href="/licenses/bsd.html">éè¦ãªéãã®ããã©ã¤ã»ã³ã¹ãã²ã¨ã¾ã¨ãã«ãã¦ãã</a>ããã§ãããã¨ãã°ã宣ä¼æ¡é
ã®ãããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã¯GNUä¸è¬å
¬è¡ã©ã¤ã»ã³ã¹ã¨ä¸¡ç«ãã¾ããããä¿®æ£BSDã©ã¤ã»ã³ã¹ã¯GPLã¨ä¸¡ç«ãã¾ãã</p>
<p>
ãã®æ··åãé¿ããããã«ã¯ã<a
href="/licenses/license-list.html">åé¡ã®ã©ã¤ã»ã³ã¹ã®ç¹å®ã®å称</a>ã使ãããBSDã¹ã¿ã¤ã«ãã¨ãã£ãææ§ãªç¨èªãé¿ãããã¨ãæé©ã§ãã</p>
@@ -591,7 +591,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/11/30 08:29:37 $
+$Date: 2015/12/29 07:07:07 $
<!-- timestamp end -->
</p>
Index: philosophy/x.ja.html
===================================================================
RCS file: /web/www/www/philosophy/x.ja.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- philosophy/x.ja.html 13 Jan 2015 05:32:03 -0000 1.34
+++ philosophy/x.ja.html 29 Dec 2015 07:07:07 -0000 1.35
@@ -25,7 +25,7 @@
<p>
èªç±ã½ããã¦ã§ã¢éçºè
ã®ä¸é¨ã¯ãã³ãã¼ã¬ããã§ãªãé
å¸å½¢æ
ã好ãã§ãã¾ããXFree86ã<a
-href="/philosophy/bsd.html">BSD</a>ã©ã¤ã»ã³ã¹ã®ãããªã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ã®åºæ¬ã«ãªã£ã¦ããã®ã¯ã誰ã«å¯¾ãã¦ã(ããªãã®ææãå
ã¨ãã¦ãã»ãã®äººã
ãå¶éãããã¨çã£ã¦ãã人ã«å¯¾ãã¦ã§ããã)ã決ãã¦å¦ã¨è¨ããªããã¨ããèãæ¹ã§ããã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã·ã³ã°ã¯ééã£ããã¨ã¨ã¾ã§ã¯è¨ãã¾ãããããããããã§ã¯ãã½ããã¦ã§ã¢ãå¤æ´ãé
å¸ã§ããã¨ããããããã¡ã®èªç±ãç©æ¥µçã«ä¿è·ããæ©ä¼ããã¿ãã¿ã失ã£ã¦ããã¨ãããã¨ã«ãªãã¾ããä¿è·ããããã«ã¯ãã³ãã¼ã¬ãããå¿
è¦ãªã®ã§ãã</p>
+href="/licenses/bsd.html">BSD</a>ã©ã¤ã»ã³ã¹ã®ãããªã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ã®åºæ¬ã«ãªã£ã¦ããã®ã¯ã誰ã«å¯¾ãã¦ã(ããªãã®ææãå
ã¨ãã¦ãã»ãã®äººã
ãå¶éãããã¨çã£ã¦ãã人ã«å¯¾ãã¦ã§ããã)ã決ãã¦å¦ã¨è¨ããªããã¨ããèãæ¹ã§ããã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã·ã³ã°ã¯ééã£ããã¨ã¨ã¾ã§ã¯è¨ãã¾ãããããããããã§ã¯ãã½ããã¦ã§ã¢ãå¤æ´ãé
å¸ã§ããã¨ããããããã¡ã®èªç±ãç©æ¥µçã«ä¿è·ããæ©ä¼ããã¿ãã¿ã失ã£ã¦ããã¨ãããã¨ã«ãªãã¾ããä¿è·ããããã«ã¯ãã³ãã¼ã¬ãããå¿
è¦ãªã®ã§ãã</p>
<p>
ä½å¹´ã«ã渡ã£ã¦ãXã³ã³ã½ã¼ã·ã¢ã
ã¯ã³ãã¼ã¬ããã«å対ããæ¥å
éã§ãããé義çãªå§åã¨å§åã®ä¸¡æ¹ãé§ä½¿ããèªç±ã½ããã¦ã§ã¢ã®éçºè
ãã¡ãèªåã®ããã°ã©ã
ã«ã³ãã¼ã¬ããã使ãã®ãããããããã¨ãã¦ããã®ã§ããXã³ã³ã½ã¼ã·ã¢ã
ã¯ãå¦ã¨è¨ãã®ã¯è¯ããªããã¨ã ãã¨ç¤ºåãã¦éçºè
ã®å«ç観ã«è¨´ããä¸æ¹ã³ãã¼ã¬ããã®ã½ããã¦ã§ã¢ã¯Xã®é
å¸ç©ã«å«ããªããã¨ããè¦åãå®ãããã¨ã§å§åããããã®ã§ããã</p>
@@ -120,7 +120,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
@@ -134,11 +134,11 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1998, 1999, 2009 Richard M. Stallman</p>
+<p>Copyright © 1998, 1999, 2009, 2015 Richard M. Stallman</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">
@@ -149,7 +149,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/01/13 05:32:03 $
+$Date: 2015/12/29 07:07:07 $
<!-- timestamp end -->
</p>
Index: philosophy/po/essays-and-articles.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ja-en.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- philosophy/po/essays-and-articles.ja-en.html 12 Nov 2015 04:58:13
-0000 1.52
+++ philosophy/po/essays-and-articles.ja-en.html 29 Dec 2015 07:07:07
-0000 1.53
@@ -134,7 +134,7 @@
Censorship envy and licensing</a></li>
<li><a href="/philosophy/x.html">The X Window System Trap</a></li>
<li><a href="/philosophy/apsl.html">The Problems of the Apple
License</a></li>
- <li><a href="/philosophy/bsd.html">The BSD License Problem</a></li>
+ <li><a href="/licenses/bsd.html">The BSD License Problem</a></li>
<li><a href="/philosophy/netscape-npl.html">The Netscape Public License
Has Serious Problems</a>. An <a href="/philosophy/netscape-npl-old.html">
earlier version of this article</a> is also available.</li>
@@ -605,7 +605,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/11/12 04:58:13 $
+$Date: 2015/12/29 07:07:07 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/self-interest.translist
===================================================================
RCS file: /web/www/www/philosophy/po/self-interest.translist,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/self-interest.translist 23 May 2015 05:09:34 -0000
1.9
+++ philosophy/po/self-interest.translist 29 Dec 2015 07:07:07 -0000
1.10
@@ -4,6 +4,7 @@
<p>
<span dir="ltr" class="original"><a lang="en" hreflang="en"
href="/philosophy/self-interest.en.html">English</a> [en]</span>
<span dir="ltr"><a lang="fr" hreflang="fr"
href="/philosophy/self-interest.fr.html">français</a> [fr]</span>
+<span dir="ltr"><a lang="ru" hreflang="ru"
href="/philosophy/self-interest.ru.html">ÑÑÑÑкий</a> [ru]</span>
<span dir="ltr"><a lang="zh-cn" hreflang="zh-cn"
href="/philosophy/self-interest.zh-cn.html">ç®ä½ä¸æ</a> [zh-cn]</span>
<span dir="ltr"><a lang="zh-tw" hreflang="zh-tw"
href="/philosophy/self-interest.zh-tw.html">ç¹é«ä¸æ</a> [zh-tw]</span>
</p>
@@ -11,6 +12,7 @@
<link rel="alternate" type="text/html" href="/philosophy/self-interest.html"
hreflang="x-default" />
<link rel="alternate" type="text/html" lang="en" hreflang="en"
href="/philosophy/self-interest.en.html" title="English" />
<link rel="alternate" type="text/html" lang="fr" hreflang="fr"
href="/philosophy/self-interest.fr.html" title="français" />
+<link rel="alternate" type="text/html" lang="ru" hreflang="ru"
href="/philosophy/self-interest.ru.html" title="ÑÑÑÑкий" />
<link rel="alternate" type="text/html" lang="zh-cn" hreflang="zh-cn"
href="/philosophy/self-interest.zh-cn.html" title="ç®ä½ä¸æ" />
<link rel="alternate" type="text/html" lang="zh-tw" hreflang="zh-tw"
href="/philosophy/self-interest.zh-tw.html" title="ç¹é«ä¸æ" />
<!-- end translist file -->
Index: philosophy/po/who-does-that-server-really-serve.ja-en.html
===================================================================
RCS file:
/web/www/www/philosophy/po/who-does-that-server-really-serve.ja-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/po/who-does-that-server-really-serve.ja-en.html 30 Nov 2015
05:58:53 -0000 1.10
+++ philosophy/po/who-does-that-server-really-serve.ja-en.html 29 Dec 2015
07:07:07 -0000 1.11
@@ -255,7 +255,7 @@
you trust the other party with your money and other personal
information (starting with your name).</p>
-<p>Repository sites such as as Savannah and SourceForge are not
+<p>Repository sites such as Savannah and SourceForge are not
inherently SaaSS, because a repository's job is publication of data
supplied to it.</p>
@@ -447,7 +447,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/11/30 05:58:53 $
+$Date: 2015/12/29 07:07:07 $
<!-- timestamp end -->
</p>
</div>
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.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- philosophy/po/words-to-avoid.ja-en.html 30 Nov 2015 05:58:53 -0000
1.45
+++ philosophy/po/words-to-avoid.ja-en.html 29 Dec 2015 07:07:08 -0000
1.46
@@ -173,7 +173,7 @@
<h3 id="BSD-style">“BSD-style”</h3>
<p>
The expression “BSD-style license” leads to confusion because it
-<a href="/philosophy/bsd.html">lumps together licenses that have
+<a href="/licenses/bsd.html">lumps together licenses that have
important differences</a>. For instance, the original BSD license
with the advertising clause is incompatible with the GNU General
Public License, but the revised BSD license is compatible with the
@@ -1109,7 +1109,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/11/30 05:58:53 $
+$Date: 2015/12/29 07:07:08 $
<!-- 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.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- philosophy/po/words-to-avoid.ja.po 29 Dec 2015 06:27:10 -0000 1.124
+++ philosophy/po/words-to-avoid.ja.po 29 Dec 2015 07:07:08 -0000 1.125
@@ -369,9 +369,9 @@
"the revised BSD license is compatible with the GPL."
msgstr ""
"ãBSDã¹ã¿ã¤ã«ã»ã©ã¤ã»ã³ã¹ãã¨ãã表ç¾ã¯ãæ··åãçã¿ã¾ãããªããªããããã¯ã"
-"<a
href=\"/licenses/bsd.html\">éè¦ãªéãã®ããã©ã¤ã»ã³ã¹ãã²ã¨ã¾ã¨ãã«ãã¦"
-"ãã</a>ããã§ãããã¨ãã°ã宣ä¼æ¡é
ã®ãããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã¯GNUä¸è¬"
-"å
¬è¡ã©ã¤ã»ã³ã¹ã¨ä¸¡ç«ãã¾ããããä¿®æ£BSDã©ã¤ã»ã³ã¹ã¯GPLã¨ä¸¡ç«ãã¾ãã"
+"<a
href=\"/licenses/bsd.html\">éè¦ãªéãã®ããã©ã¤ã»ã³ã¹ãã²ã¨ã¾ã¨ãã«ãã¦ã"
+"ã</a>ããã§ãããã¨ãã°ã宣ä¼æ¡é
ã®ãããªãªã¸ãã«ã®BSDã©ã¤ã»ã³ã¹ã¯GNUä¸è¬å
¬"
+"è¡ã©ã¤ã»ã³ã¹ã¨ä¸¡ç«ãã¾ããããä¿®æ£BSDã©ã¤ã»ã³ã¹ã¯GPLã¨ä¸¡ç«ãã¾ãã"
#. type: Content of: <p>
msgid ""
Index: philosophy/po/x.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.ja-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/x.ja-en.html 12 Apr 2014 14:00:12 -0000 1.19
+++ philosophy/po/x.ja-en.html 29 Dec 2015 07:07:08 -0000 1.20
@@ -26,7 +26,7 @@
<p>
Some free software developers prefer noncopyleft distribution.
Noncopyleft licenses such as the XFree86 and
-<a href="/philosophy/bsd.html">BSD</a> licenses are based on the idea
+<a href="/licenses/bsd.html">BSD</a> licenses are based on the idea
of never saying no to anyone—not even to someone who seeks to
use your work as the basis for restricting other people. Noncopyleft
licensing does nothing wrong, but it misses the opportunity to
@@ -186,7 +186,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
@@ -201,17 +201,17 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1998, 1999, 2009 Richard M. Stallman</p>
+<p>Copyright © 1998, 1999, 2009, 2015 Richard M. Stallman</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/04/12 14:00:12 $
+$Date: 2015/12/29 07:07:08 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/x.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.ja.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/po/x.ja.po 29 Dec 2015 06:27:10 -0000 1.17
+++ philosophy/po/x.ja.po 29 Dec 2015 07:07:08 -0000 1.18
@@ -71,13 +71,13 @@
"software. For that, we need copyleft."
msgstr ""
"èªç±ã½ããã¦ã§ã¢éçºè
ã®ä¸é¨ã¯ãã³ãã¼ã¬ããã§ãªãé
å¸å½¢æ
ã好ãã§ãã¾ãã"
-"XFree86ã<a
href=\"/licenses/bsd.html\">BSD</a>ã©ã¤ã»ã³ã¹ã®ãããªã³ãã¼ã¬ã"
-"ãã§ãªãã©ã¤ã»ã³ã¹ã®åºæ¬ã«ãªã£ã¦ããã®ã¯ã誰ã«å¯¾ãã¦ã(ããªãã®ææãå
ã¨ã"
-"ã¦ãã»ãã®äººã
ãå¶éãããã¨çã£ã¦ãã人ã«å¯¾ãã¦ã§ããã)ã決ãã¦å¦ã¨è¨ããª"
-"ããã¨ããèãæ¹ã§ããã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã·ã³ã°ã¯ééã£ããã¨ã¨ã¾ã§ã¯"
-"è¨ãã¾ãããããããããã§ã¯ãã½ããã¦ã§ã¢ãå¤æ´ãé
å¸ã§ããã¨ããããããã¡"
-"ã®èªç±ãç©æ¥µçã«ä¿è·ããæ©ä¼ããã¿ãã¿ã失ã£ã¦ããã¨ãããã¨ã«ãªãã¾ããä¿è·"
-"ããããã«ã¯ãã³ãã¼ã¬ãããå¿
è¦ãªã®ã§ãã"
+"XFree86ã<a
href=\"/licenses/bsd.html\">BSD</a>ã©ã¤ã»ã³ã¹ã®ãããªã³ãã¼ã¬ãã"
+"ã§ãªãã©ã¤ã»ã³ã¹ã®åºæ¬ã«ãªã£ã¦ããã®ã¯ã誰ã«å¯¾ãã¦ã(ããªãã®ææãå
ã¨ãã¦ã"
+"ã»ãã®äººã
ãå¶éãããã¨çã£ã¦ãã人ã«å¯¾ãã¦ã§ããã)ã決ãã¦å¦ã¨è¨ããªããã¨"
+"ããèãæ¹ã§ããã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã·ã³ã°ã¯ééã£ããã¨ã¨ã¾ã§ã¯è¨ãã¾"
+"ãããããããããã§ã¯ãã½ããã¦ã§ã¢ãå¤æ´ãé
å¸ã§ããã¨ããããããã¡ã®èªç±"
+"ãç©æ¥µçã«ä¿è·ããæ©ä¼ããã¿ãã¿ã失ã£ã¦ããã¨ãããã¨ã«ãªãã¾ããä¿è·ããã"
+"ãã«ã¯ãã³ãã¼ã¬ãããå¿
è¦ãªã®ã§ãã"
#. type: Content of: <p>
msgid ""
Index: proprietary/proprietary-back-doors.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-back-doors.ja.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- proprietary/proprietary-back-doors.ja.html 1 Dec 2015 05:01:17 -0000
1.8
+++ proprietary/proprietary-back-doors.ja.html 29 Dec 2015 07:07:08 -0000
1.9
@@ -15,6 +15,25 @@
<p>ãã¡ãããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ã®ããã¯ãã¢ã®è¨¼æãããä¾ã§ãã</p>
<ul>
+ <li>
+
<p>ãã«ã®ã³ã³ãã¥ã¼ã¿ãã¦ã£ã³ãã¦ãºã¨ã¨ãã«åºè·ããããã®ãã¯å½ã®ã«ã¼ã証ææ¸ãæãããã®ã³ã³ãã¥ã¼ã¿ã§ã¯<a
+href="http://fossforce.com/2015/11/dell-comcast-intel-who-knows-who-else-are-out-to-get-you/">誰ãã(ãã«ã
ãã§ãªã)é
éæä½ãã¦ã©ããªã½ããã¦ã§ã¢ãå®è¡ãããã¨ã許å¯ã§ãã</a>ããã«ãªã£ã¦ãã¾ããã</p>
+ </li>
+ <li>
+
<p>Baiduã®ãããã©ã¤ã¨ã¿ãªãªã¢ã³ããã¤ãã®ã©ã¤ãã©ãªãMoplusã¯ããã¯ãã¢ãæãã<a
+href="https://www.eff.org/deeplinks/2015/11/millions-android-devices-vulnerable-remote-hijacking-baidu-wrote-code-google-made">ããã¡ã¤ã«ã®ã¢ãããã¼ãããå¼·å¶çã«ã¢ããªãã¤ã³ã¹ãã¼ã«ãã</a>ããã«ãªã£ã¦ãã¾ããã</p>
+
<p>ããã¯14,000ã®ã¢ã³ããã¤ãã®ã¢ããªã±ã¼ã·ã§ã³ã«ä½¿ããã¦ãã¾ãã</p>
+ </li>
+ <li>
+ <p>ãã¤ã¯ãã½ããã¯<a
+href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html">ã¦ã£ã³ãã¦ãº
+7ã¨8ãåããã¦ããã³ã³ãã¥ã¼ã¿ãæ»æãã¦ãã¾ã</a>ã(ã¦ã¼ã¶ãããããªãã«ãã¦ããå
´åã«)ã¦ã£ã³ãã¦ãº10ã«ãã¢ããã°ã¬ã¼ãããããã©ããã®ãã©ã°ããªã³ã«å¤æ´ãã¦ã§ãã</p>
+
+
<p>ã¨ããã§ãããã¯ãããã¯ã¦ã£ã³ãã¦ãº7ã¨8ã®ä¸è½ããã¯ãã¢ã®åå¨ãå確èªãã¾ãã</p>
+ </li>
+<li><p>ARRISã±ã¼ãã«ã¢ãã ã¯<a
+href="https://w00tsec.blogspot.de/2015/11/arris-cable-modem-has-backdoor-in.html?m=1">ããã¯ãã¢ã«ããã¯ãã¢</a>ãããã¾ãã</p>
+</li>
<li><p>ãã£ã¿ãã©ä»ã®ä¹ç©ãé éæä½ã§<a
href="http://www.zerohedge.com/news/2015-11-19/caterpillar-depression-has-never-been-worse-it-has-cunning-plan-how-deal-it">ã¨ã³ã¸ã³ãæ¢ããããã¯ãã¢ä»ã§</a>æ¥ã¾ããã</p>
</li>
@@ -175,7 +194,7 @@
<ul>
<li>
<p><a
-href="http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI">ã¤ã³ãã«ã¨AMDã®ãã¤ã¯ãããã»ããµã®å¤æ´å¯è½ãªèå¦çã³ã¼ã</a>ã¯ããã¤ã¯ãã½ããã®å©åã§ãNSAãã³ã³ãã¥ã¼ã¿ã«ä¾µå
¥ããããã®ä¹ç©ã¨ãªãå¯è½æ§ããããã¨ã»ãã¥ãªãã£ã®å°é家ãè¨ã£ã¦ã¾ãã
+href="http://web.archive.org/web/20150206003913/http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI">ã¤ã³ãã«ã¨AMDã®ãã¤ã¯ãããã»ããµã®å¤æ´å¯è½ãªèå¦çã³ã¼ã</a>ã¯ããã¤ã¯ãã½ããã®å©åã§ãNSAãã³ã³ãã¥ã¼ã¿ã«ä¾µå
¥ããããã®ä¹ç©ã¨ãªãå¯è½æ§ããããã¨ã»ãã¥ãªãã£ã®å°é家ãè¨ã£ã¦ã¾ãã
</p>
</li>
</ul>
@@ -235,7 +254,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/12/01 05:01:17 $
+$Date: 2015/12/29 07:07:08 $
<!-- timestamp end -->
</p>
Index: proprietary/proprietary-sabotage.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-sabotage.ja.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- proprietary/proprietary-sabotage.ja.html 3 Dec 2015 23:59:17 -0000
1.9
+++ proprietary/proprietary-sabotage.ja.html 29 Dec 2015 07:07:08 -0000
1.10
@@ -15,6 +15,11 @@
<p>ãã¡ããããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ãããã¯ãã¢ãããæªè³ªãªãã®ãæããä¾ã§ãã</p>
<ul>
+ <li>
+ <p>好ãã§ãå«ãã§ããã¤ã¯ãã½ããã¯<a
+href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html">ã¦ã£ã³ãã¦ãºã®ã¢ãããã¼ããå¼·å¶çã«ãã¼ã¸ã§ã³10ã¸ã¨æ¼ãä»ã</a>ã¾ããã¢ããã°ã¬ã¼ãããªãã¨æå®ã§ããã¦ã£ã³ãã¦ãºã®ãã©ã°ãç¡è¦ãã¦ãã§ããããã¯ã<a
+href="/proprietary/proprietary-back-doors.html">ä¸è½ããã¯ãã¢ãã¦ã£ã³ãã¦ãº</a>ãã¼ã¸ã§ã³7ã¨8ã«åå¨ãããã¨ãå確èªãã¾ãã</p>
+ </li>
<li><p>ã¦ã£ã³ãã¦ãº10ã®ãã¢ããã°ã¬ã¼ããã¯ã許å¯ãæ±ããªãã§<a
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/">ã¢ããªã±ã¼ã·ã§ã³ãåé¤ãã¾ã</a>ã</p>
</li>
@@ -198,7 +203,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/12/03 23:59:17 $
+$Date: 2015/12/29 07:07:08 $
<!-- timestamp end -->
</p>
Index: proprietary/proprietary-surveillance.ja.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-surveillance.ja.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- proprietary/proprietary-surveillance.ja.html 3 Dec 2015 23:59:17
-0000 1.14
+++ proprietary/proprietary-surveillance.ja.html 29 Dec 2015 07:07:09
-0000 1.15
@@ -47,6 +47,7 @@
</li>
<li><a href="#SpywareOnTheRoad">å±å¤ã®ã¹ãã¤ã¦ã§ã¢</a>
<ul>
+ <li><a href="#SpywareInCameras">ã«ã¡ã©ã®ã¹ãã¤ã¦ã§ã¢</a></li>
<li><a
href="#SpywareInElectronicReaders">é»åãªã¼ãã®ã¹ãã¤ã¦ã§ã¢</a></li>
<li><a href="#SpywareInVehicles">ä¹ãç©ã®ã¹ãã¤ã¦ã§ã¢</a></li>
</ul>
@@ -451,6 +452,19 @@
</div>
<div style="clear: left;"></div>
+<div class="big-subsection">
+ <h4 id="SpywareInCameras">ã«ã¡ã©ã®ã¹ãã¤ã¦ã§ã¢</h4>
+ <span class="anchor-reference-id">(<a
+href="#SpywareInCameras">#SpywareInCameras</a>)</span>
+</div>
+
+<ul>
+ <li>
+ <p>Nest Cam “smart” ã«ã¡ã©ã¯<a
+href="http://www.bbc.com/news/technology-34922712">常æç£è¦ãã¾ã</a>ããææè
ãããã®ã¹ã¤ããããåã£ã¦ãããã¨ãã§ãã§ãã</p>
+ <p>ãã¹ãã¼ãããªããã¤ã¹ã¨ã¯ã製é è
ãããã使ã£ã¦ããªãã®è£ãããã¨ããæå³ã§ãã</p>
+ </li>
+</ul>
<div class="big-subsection">
<h4 id="SpywareInElectronicReaders">é»åãªã¼ãã®ã¹ãã¤ã¦ã§ã¢</h4>
@@ -469,7 +483,6 @@
</li>
</ul>
-
<div class="big-subsection">
<h4 id="SpywareInVehicles">ä¹ãç©ã®ã¹ãã¤ã¦ã§ã¢</h4>
<span class="anchor-reference-id">(<a
@@ -514,6 +527,8 @@
ããæ¥ã女æ§ãè¿ã¥ãã¦ãã¦ãããããããã¬ãã§ããªããã¿ãããã?ãã¨èãããåã¯çãããããããããªãããéããã¯ã¿ããªããããããã¨ãæããã«ããã¯ã¢ãã¾ã³ã®ãã¹ãã¼ããTV以åã®è©±ã§ãã</p>
<ul>
+
<li><p>Tivoã®Viacomã¨ã®ææºã¯äºç¾ä¸åä¸ã®å®¶åºãããã§ã«ãã®ä¼ç¤¾ãç£è¦ãã¦ããå
ç¾ä¸ã®ã½ã¼ã·ã£ã«ã»ã¡ãã£ã¢ã»ãããã¡ã¤ã«ã«å
ãã¾ãããTivoã®é¡§å®¢ã¯åºå主ã«ç£è¦ããã¤ã¥ãããã¨ãç¥ãã¾ããã§ããããã¬ãã®è¦è´ã¨ãªã³ã©ã¤ã³ã®ã½ã¼ã·ã£ã«ã»ã¡ãã£ã¢ã®åå
ã®æ
å ±ãçµã¿åããããã¨ã§ãTivoã¯ä»ã<a
+href="http://www.reuters.com/article/viacom-tivo-idUSL1N12U1VV20151102">ãã¬ãåºåã¨ãªã³ã©ã¤ã³ã®è³¼è²·ã®ç¸é¢ã調ã¹</a>ãããã©ã«ãã§ãã¹ã¦ã®ã¦ã¼ã¶ãæ°ããçµã¿åããããç£è¦ã«ãããã®ã§ãã</p></li>
<li><p>ããã¦ã§ãã¨ãã¬ãã®åºåã¯éå¯è´ã®é³ãé³´ãããè¿ãã®ç¯å²ã®ã»ãã®ããã¤ã¹ã§ç¨¼åãããããã©ã¤ã¨ã¿ãªã®ãã«ã¦ã§ã¢ã«æ¤åºãããããã«ããè¿ãã«ãããã¨ãç¥ããã¾ããä¸åº¦ãããªãã®ã¤ã³ã¿ã¼ãããã»ããã¤ã¹ããã¬ãã¨çµã¿åãããããã°ãåºå主ã¯åºåãã¦ã§ãã®æ´»åãã»ãã®<a
href="http://arstechnica.com/tech-policy/2015/11/beware-of-ads-that-use-inaudible-sound-to-link-your-phone-tv-tablet-and-pc/">ããã¤ã¹éã®è¿½è·¡æ©è½</a>ã¨é¢é£ããããã¨ãã§ããã®ã§ãã</p>
</li>
@@ -681,7 +696,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/12/03 23:59:17 $
+$Date: 2015/12/29 07:07:09 $
<!-- timestamp end -->
</p>
Index: proprietary/po/proprietary-back-doors.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.ja-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- proprietary/po/proprietary-back-doors.ja-en.html 1 Dec 2015 05:01:18
-0000 1.6
+++ proprietary/po/proprietary-back-doors.ja-en.html 29 Dec 2015 07:07:09
-0000 1.7
@@ -10,6 +10,34 @@
<p>Here are examples of demonstrated back doors in proprietary software.</p>
<ul>
+ <li>
+ <p>Dell computers, shipped with Windows, had a bogus root
+ certificate that
+ <a
href="http://fossforce.com/2015/11/dell-comcast-intel-who-knows-who-else-are-out-to-get-you/">allowed
+ anyone (not just Dell) to remotely authorize any software to
+ run</a> on the computer.</p>
+ </li>
+ <li>
+ <p>Baidu's proprietary Android library, Moplus, has a back door
+ that <a
href="https://www.eff.org/deeplinks/2015/11/millions-android-devices-vulnerable-remote-hijacking-baidu-wrote-code-google-made">can
+ “upload files” as well as forcibly install
+ apps</a>.</p>
+ <p>It is used by 14,000 Android applications.</p>
+ </li>
+ <li>
+ <p>Microsoft
+ is <a
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html">attacking
+ computers that run Windows 7 and 8</a>, switching on a flag that
+ says whether to “upgrade” to Windows 10 when users have turned
it
+ off.</p>
+
+ <p>This, by the way, reaffirms the presence of a universal back
+ door in Windows 7 and 8.</p>
+ </li>
+<li><p>ARRIS cable modem has a
+ <a
href="https://w00tsec.blogspot.de/2015/11/arris-cable-modem-has-backdoor-in.html?m=1">
+ backdoor in the backdoor</a>.</p>
+</li>
<li><p>Caterpillar vehicles come with
<a
href="http://www.zerohedge.com/news/2015-11-19/caterpillar-depression-has-never-been-worse-it-has-cunning-plan-how-deal-it">a
back-door to shutoff the engine</a>
remotely.</p>
@@ -212,7 +240,7 @@
<ul>
<li>
-<p><a
href="http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI">
+<p><a
href="http://web.archive.org/web/20150206003913/http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI">
Writable microcode for Intel and AMD microprocessors</a> may be a vehicle
for the NSA to invade computers, with the help of Microsoft, say respected
security experts.
@@ -263,7 +291,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/12/01 05:01:18 $
+$Date: 2015/12/29 07:07:09 $
<!-- timestamp end -->
</p>
</div>
Index: proprietary/po/proprietary-back-doors.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.ja.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- proprietary/po/proprietary-back-doors.ja.po 29 Dec 2015 06:27:10 -0000
1.28
+++ proprietary/po/proprietary-back-doors.ja.po 29 Dec 2015 07:07:09 -0000
1.29
@@ -44,11 +44,11 @@
"are-out-to-get-you/\">allowed anyone (not just Dell) to remotely authorize "
"any software to run</a> on the computer."
msgstr ""
-"ãã«ã®ã³ã³ãã¥ã¼ã¿ãã¦ã£ã³ãã¦ãºã¨ã¨ãã«åºè·ããããã®ãã¯å½ã®ã«ã¼ã証ææ¸ãæãããã®"
-"ã³ã³ãã¥ã¼ã¿ã§ã¯<a "
-"href=\"http://fossforce.com/2015/11/dell-comcast-intel-who-knows-who-else-"
-"are-out-to-get-you/\">誰ãã(ãã«ã ãã§ãªã)é
éæä½ãã¦ã©ããªã½ããã¦ã§ã¢ã"
-"å®è¡ãããã¨ã許å¯ã§ãã</a>ããã«ãªã£ã¦ãã¾ããã"
+"ãã«ã®ã³ã³ãã¥ã¼ã¿ãã¦ã£ã³ãã¦ãºã¨ã¨ãã«åºè·ããããã®ãã¯å½ã®ã«ã¼ã証ææ¸ã"
+"æãããã®ã³ã³ãã¥ã¼ã¿ã§ã¯<a
href=\"http://fossforce.com/2015/11/dell-"
+"comcast-intel-who-knows-who-else-are-out-to-get-you/\">誰ãã(ãã«ã
ãã§ãªã)"
+"é
éæä½ãã¦ã©ããªã½ããã¦ã§ã¢ãå®è¡ãããã¨ã許å¯ã§ãã</a>ããã«ãªã£ã¦ãã¾"
+"ããã"
#. type: Content of: <ul><li><p>
msgid ""
@@ -57,10 +57,10 @@
"remote-hijacking-baidu-wrote-code-google-made\">can “upload "
"files” as well as forcibly install apps</a>."
msgstr ""
-"Baiduã®ãããã©ã¤ã¨ã¿ãªãªã¢ã³ããã¤ãã®ã©ã¤ãã©ãªãMoplusã¯ããã¯ãã¢ãæãã<a
href="
-"\"https://www.eff.org/deeplinks/2015/11/millions-android-devices-vulnerable-"
-"remote-hijacking-baidu-wrote-code-google-made\">ããã¡ã¤ã«ã®ã¢ãããã¼ããã"
-"å¼·å¶çã«ã¢ããªãã¤ã³ã¹ãã¼ã«ãã</a>ããã«ãªã£ã¦ãã¾ããã"
+"Baiduã®ãããã©ã¤ã¨ã¿ãªãªã¢ã³ããã¤ãã®ã©ã¤ãã©ãªãMoplusã¯ããã¯ãã¢ãæãã"
+"<a href=\"https://www.eff.org/deeplinks/2015/11/millions-android-devices-"
+"vulnerable-remote-hijacking-baidu-wrote-code-google-made\">ããã¡ã¤ã«ã®ã¢ãã"
+"ãã¼ãããå¼·å¶çã«ã¢ããªãã¤ã³ã¹ãã¼ã«ãã</a>ããã«ãªã£ã¦ãã¾ããã"
#. type: Content of: <ul><li><p>
msgid "It is used by 14,000 Android applications."
@@ -76,16 +76,17 @@
msgstr ""
"ãã¤ã¯ãã½ããã¯<a
href=\"http://www.computerworld.com/article/3012278/"
"microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-"
-"strategy.html\">ã¦ã£ã³ãã¦ãº
7ã¨8ãåããã¦ããã³ã³ãã¥ã¼ã¿ãæ»æãã¦ãã¾ã</a>ã"
-"(ã¦ã¼ã¶ãããããªãã«ãã¦ããå ´åã«)"
-"ã¦ã£ã³ãã¦ãº10ã«ãã¢ããã°ã¬ã¼ãããããã©ããã®ãã©ã°ããªã³ã«å¤æ´ãã¦ã§ãã"
+"strategy.html\">ã¦ã£ã³ãã¦ãº
7ã¨8ãåããã¦ããã³ã³ãã¥ã¼ã¿ãæ»æãã¦ãã¾ã</"
+"a>ã(ã¦ã¼ã¶ãããããªãã«ãã¦ããå
´åã«)ã¦ã£ã³ãã¦ãº10ã«ãã¢ããã°ã¬ã¼ããã"
+"ããã©ããã®ãã©ã°ããªã³ã«å¤æ´ãã¦ã§ãã"
#. type: Content of: <ul><li><p>
msgid ""
"This, by the way, reaffirms the presence of a universal back door in Windows "
"7 and 8."
msgstr ""
-"ã¨ããã§ãããã¯ãããã¯ã¦ã£ã³ãã¦ãº7ã¨8ã®ä¸è½ããã¯ãã¢ã®åå¨ãå確èªãã¾ãã"
+"ã¨ããã§ãããã¯ãããã¯ã¦ã£ã³ãã¦ãº7ã¨8ã®ä¸è½ããã¯ãã¢ã®åå¨ãå確èªãã¾"
+"ãã"
#. type: Content of: <ul><li><p>
msgid ""
@@ -434,11 +435,11 @@
"for the NSA to invade computers, with the help of Microsoft, say respected "
"security experts."
msgstr ""
-"<a
href=\"http://web.archive.org/web/20150206003913/http://www.afr.com/p/technology/"
-"intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\">ã¤ã³ãã«ã¨AMDã®ãã¤"
-"ã¯ãããã»ããµã®å¤æ´å¯è½ãªèå¦çã³ã¼ã</a>ã¯ããã¤ã¯ãã½ããã®å©åã§ãNSAãã³"
-"ã³ãã¥ã¼ã¿ã«ä¾µå
¥ããããã®ä¹ç©ã¨ãªãå¯è½æ§ããããã¨ã»ãã¥ãªãã£ã®å°é家ã"
-"è¨ã£ã¦ã¾ãã"
+"<a href=\"http://web.archive.org/web/20150206003913/http://www.afr.com/p/"
+"technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\">ã¤ã³ãã«"
+"ã¨AMDã®ãã¤ã¯ãããã»ããµã®å¤æ´å¯è½ãªèå¦çã³ã¼ã</a>ã¯ããã¤ã¯ãã½ããã®å©å"
+"ã§ãNSAãã³ã³ãã¥ã¼ã¿ã«ä¾µå
¥ããããã®ä¹ç©ã¨ãªãå¯è½æ§ããããã¨ã»ãã¥ãªãã£ã®"
+"å°é家ãè¨ã£ã¦ã¾ãã"
#. type: Content of: <p>
msgid ""
Index: proprietary/po/proprietary-deception.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-deception.ru.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- proprietary/po/proprietary-deception.ru.po 29 Dec 2015 06:39:47 -0000
1.1
+++ proprietary/po/proprietary-deception.ru.po 29 Dec 2015 07:07:09 -0000
1.2
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-11-30 16:25+0000\n"
#. type: Content of: <title>
msgid "Proprietary Deception - GNU Project - Free Software Foundation"
Index: proprietary/po/proprietary-deception.translist
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-deception.translist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- proprietary/po/proprietary-deception.translist 30 Nov 2015 08:29:39
-0000 1.4
+++ proprietary/po/proprietary-deception.translist 29 Dec 2015 07:07:09
-0000 1.5
@@ -6,6 +6,7 @@
<span dir="ltr"><a lang="de" hreflang="de"
href="/proprietary/proprietary-deception.de.html">Deutsch</a> [de]</span>
<span dir="ltr"><a lang="fr" hreflang="fr"
href="/proprietary/proprietary-deception.fr.html">français</a> [fr]</span>
<span dir="ltr"><a lang="ja" hreflang="ja"
href="/proprietary/proprietary-deception.ja.html">æ¥æ¬èª</a> [ja]</span>
+<span dir="ltr"><a lang="ru" hreflang="ru"
href="/proprietary/proprietary-deception.ru.html">ÑÑÑÑкий</a> [ru]</span>
</p>
</div>' -->
<link rel="alternate" type="text/html"
href="/proprietary/proprietary-deception.html" hreflang="x-default" />
@@ -13,4 +14,5 @@
<link rel="alternate" type="text/html" lang="de" hreflang="de"
href="/proprietary/proprietary-deception.de.html" title="Deutsch" />
<link rel="alternate" type="text/html" lang="fr" hreflang="fr"
href="/proprietary/proprietary-deception.fr.html" title="français" />
<link rel="alternate" type="text/html" lang="ja" hreflang="ja"
href="/proprietary/proprietary-deception.ja.html" title="æ¥æ¬èª" />
+<link rel="alternate" type="text/html" lang="ru" hreflang="ru"
href="/proprietary/proprietary-deception.ru.html" title="ÑÑÑÑкий" />
<!-- end translist file -->
Index: proprietary/po/proprietary-sabotage.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.ja-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- proprietary/po/proprietary-sabotage.ja-en.html 3 Dec 2015 23:59:17
-0000 1.8
+++ proprietary/po/proprietary-sabotage.ja-en.html 29 Dec 2015 07:07:09
-0000 1.9
@@ -12,6 +12,15 @@
worse than a back door.</p>
<ul>
+ <li>
+ <p>Whether you like it or not, Microsoft
+ is <a
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html">forcibly
+ pushing Windows update to its version 10</a>, ignoring the flag on
+ Windows 7 or 8 that you could set to not upgrade. This reaffirms
+ the presence of
+ a <a href="/proprietary/proprietary-back-doors.html">universal
+ back door in Windows</a> 7 and 8.</p>
+ </li>
<li><p>Windows 10 “upgrades” <a
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/">
delete applications</a> without asking permission.</p>
@@ -227,7 +236,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/12/03 23:59:17 $
+$Date: 2015/12/29 07:07:09 $
<!-- timestamp end -->
</p>
</div>
Index: proprietary/po/proprietary-sabotage.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.ja.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- proprietary/po/proprietary-sabotage.ja.po 29 Dec 2015 06:27:11 -0000
1.33
+++ proprietary/po/proprietary-sabotage.ja.po 29 Dec 2015 07:07:09 -0000
1.34
@@ -50,13 +50,13 @@
"not upgrade. This reaffirms the presence of a <a href=\"/proprietary/"
"proprietary-back-doors.html\">universal back door in Windows</a> 7 and 8."
msgstr ""
-"好ãã§ãå«ãã§ããã¤ã¯ãã½ããã¯<a
href=\"http://www.computerworld."
-"com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-"
-"windows-10-upgrade-strategy.html\">ã¦ã£ã³ãã¦ãºã®ã¢ãããã¼ããå¼·å¶çã«ãã¼ã¸ã§ã³10"
-"ã¸ã¨æ¼ãä»ã</a>ã¾ããã¢ããã°ã¬ã¼ãããªãã¨æå®ã§ããã¦ã£ã³ãã¦ãºã®ãã©ã°ãç¡è¦ãã¦ãã§ãã"
-"ããã¯ã<a href=\"/proprietary/"
-"proprietary-back-doors.html\">ä¸è½ããã¯ãã¢ãã¦ã£ã³ãã¦ãº</a>ãã¼ã¸ã§ã³7ã¨8ã«"
-"åå¨ãããã¨ãå確èªãã¾ãã"
+"好ãã§ãå«ãã§ããã¤ã¯ãã½ããã¯<a
href=\"http://www.computerworld.com/"
+"article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-"
+"windows-10-upgrade-strategy.html\">ã¦ã£ã³ãã¦ãºã®ã¢ãããã¼ããå¼·å¶çã«ãã¼"
+"ã¸ã§ã³10ã¸ã¨æ¼ãä»ã</a>ã¾ããã¢ããã°ã¬ã¼ãããªãã¨æå®ã§ããã¦ã£ã³ãã¦ãºã®"
+"ãã©ã°ãç¡è¦ãã¦ãã§ããããã¯ã<a
href=\"/proprietary/proprietary-back-"
+"doors.html\">ä¸è½ããã¯ãã¢ãã¦ã£ã³ãã¦ãº</a>ãã¼ã¸ã§ã³7ã¨8ã«åå¨ãããã¨ãå"
+"確èªãã¾ãã"
#. type: Content of: <ul><li><p>
msgid ""
Index: proprietary/po/proprietary-surveillance.ja-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-surveillance.ja-en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- proprietary/po/proprietary-surveillance.ja-en.html 3 Dec 2015 23:59:17
-0000 1.13
+++ proprietary/po/proprietary-surveillance.ja-en.html 29 Dec 2015 07:07:09
-0000 1.14
@@ -42,6 +42,7 @@
</li>
<li><a href="#SpywareOnTheRoad">Spyware on the Road</a>
<ul>
+ <li><a href="#SpywareInCameras">Spyware in Cameras</a></li>
<li><a href="#SpywareInElectronicReaders">Spyware in e-Readers</a></li>
<li><a href="#SpywareInVehicles">Spyware in Vehicles</a></li>
</ul>
@@ -567,6 +568,20 @@
</div>
<div style="clear: left;"></div>
+<div class="big-subsection">
+ <h4 id="SpywareInCameras">Spyware in Cameras</h4>
+ <span class="anchor-reference-id">(<a
href="#SpywareInCameras">#SpywareInCameras</a>)</span>
+</div>
+
+<ul>
+ <li>
+ <p>The Nest Cam “smart” camera is <a
+ href="http://www.bbc.com/news/technology-34922712">always
+ watching</a>, even when the “owner” switches it
“off.”</p>
+ <p>A “smart” device means the manufacturer is using it to
outsmart
+ you.</p>
+ </li>
+</ul>
<div class="big-subsection">
<h4 id="SpywareInElectronicReaders">Spyware in e-Readers</h4>
@@ -587,7 +602,6 @@
</li>
</ul>
-
<div class="big-subsection">
<h4 id="SpywareInVehicles">Spyware in Vehicles</h4>
<span class="anchor-reference-id">(<a
href="#SpywareInVehicles">#SpywareInVehicles</a>)</span>
@@ -642,6 +656,13 @@
before Amazon “smart” TVs.</p>
<ul>
+ <li><p>Tivo's alliance with Viacom adds 2.3 million households to
+ the 600 millions social media profiles the company already
+ monitors. Tivo customers are unaware they're being watched by
+ advertisers. By combining TV viewing information with online
+ social media participation, Tivo can now <a
href="http://www.reuters.com/article/viacom-tivo-idUSL1N12U1VV20151102">correlate
TV
+ advertisement with online purchases</a>, exposing all users to
+ new combined surveillance by default.</p></li>
<li><p>Some web and TV advertisements play inaudible sounds to be
picked up by proprietary malware running on other devices in
range so as to determine that they are nearby. Once your
@@ -828,7 +849,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/12/03 23:59:17 $
+$Date: 2015/12/29 07:07:09 $
<!-- 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.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- proprietary/po/proprietary-surveillance.ja.po 29 Dec 2015 06:27:11
-0000 1.60
+++ proprietary/po/proprietary-surveillance.ja.po 29 Dec 2015 07:07:10
-0000 1.61
@@ -1092,14 +1092,16 @@
"switches it “off.”"
msgstr ""
"Nest Cam “smart” ã«ã¡ã©ã¯<a href=\"http://www.bbc.com/news/"
-"technology-34922712\">常æç£è¦ãã¾ã</a>ããææè
ãããã®ã¹ã¤ããããåã£ã¦ãããã¨ãã§ãã§ãã"
+"technology-34922712\">常æç£è¦ãã¾ã</a>ããææè
ãããã®ã¹ã¤ããããåã£"
+"ã¦ãããã¨ãã§ãã§ãã"
#. type: Content of: <ul><li><p>
msgid ""
"A “smart” device means the manufacturer is using it to outsmart "
"you."
msgstr ""
-"ãã¹ãã¼ãããªããã¤ã¹ã¨ã¯ã製é è
ãããã使ã£ã¦ããªãã®è£ãããã¨ããæå³ã§ãã"
+"ãã¹ãã¼ãããªããã¤ã¹ã¨ã¯ã製é è
ãããã使ã£ã¦ããªãã®è£ãããã¨ããæå³ã§"
+"ãã"
#. type: Content of: <div><h4>
msgid "Spyware in e-Readers"
@@ -1244,13 +1246,13 @@
"idUSL1N12U1VV20151102\">correlate TV advertisement with online purchases</"
"a>, exposing all users to new combined surveillance by default."
msgstr ""
-"Tivoã®Viacomã¨ã®ææºã¯äºç¾ä¸åä¸ã®å®¶åºãããã§ã«ãã®ä¼ç¤¾ãç£è¦ãã¦ããå
ç¾ä¸ã®ã½ã¼ã·ã£ã«ã»"
-"ã¡ãã£ã¢ã»ãããã¡ã¤ã«ã«å
ãã¾ãããTivoã®é¡§å®¢ã¯åºå主ã«ç£è¦ããã¤ã¥ãããã¨ãç¥ãã¾ããã§"
-"ããããã¬ãã®è¦è´ã¨ãªã³ã©ã¤ã³ã®ã½ã¼ã·ã£ã«ã»ã¡ãã£ã¢ã®åå
ã®æ
å ±ãçµã¿åããããã¨ã§ã"
-"Tivoã¯ä»ã<a href="
-"\"http://www.reuters.com/article/viacom-tivo-"
-"idUSL1N12U1VV20151102\">ãã¬ãåºåã¨ãªã³ã©ã¤ã³ã®è³¼è²·ã®ç¸é¢ã調ã¹</"
-"a>ãããã©ã«ãã§ãã¹ã¦ã®ã¦ã¼ã¶ãæ°ããçµã¿åããããç£è¦ã«ãããã®ã§ãã"
+"Tivoã®Viacomã¨ã®ææºã¯äºç¾ä¸åä¸ã®å®¶åºãããã§ã«ãã®ä¼ç¤¾ãç£è¦ãã¦ããå
ç¾ä¸"
+"ã®ã½ã¼ã·ã£ã«ã»ã¡ãã£ã¢ã»ãããã¡ã¤ã«ã«å
ãã¾ãããTivoã®é¡§å®¢ã¯åºå主ã«ç£è¦ã"
+"ãã¤ã¥ãããã¨ãç¥ãã¾ããã§ããããã¬ãã®è¦è´ã¨ãªã³ã©ã¤ã³ã®ã½ã¼ã·ã£ã«ã»ã¡"
+"ãã£ã¢ã®åå ã®æ
å ±ãçµã¿åããããã¨ã§ãTivoã¯ä»ã<a
href=\"http://www."
+"reuters.com/article/viacom-tivo-idUSL1N12U1VV20151102\">ãã¬ãåºåã¨ãªã³ã©ã¤"
+"ã³ã®è³¼è²·ã®ç¸é¢ã調ã¹</a>ãããã©ã«ãã§ãã¹ã¦ã®ã¦ã¼ã¶ãæ°ããçµã¿åããããç£"
+"è¦ã«ãããã®ã§ãã"
#. type: Content of: <ul><li><p>
msgid ""
Index: server/body-include-2.ja.html
===================================================================
RCS file: /web/www/www/server/body-include-2.ja.html,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/body-include-2.ja.html 12 Dec 2015 07:50:52 -0000 1.91
+++ server/body-include-2.ja.html 29 Dec 2015 07:07:10 -0000 1.92
@@ -2,21 +2,18 @@
<!-- start of server/body-include-2 -->
<div class="fundraiser">
<div class="donate_btn">
-<p><a href="https://donate.fsf.org">Donate Now</a></p>
+<p><a href="https://donate.fsf.org">å¯ä»ãã</a></p>
</div>
-<p><strong>For thirty years, the Free Software Foundation has been seen as a
-guiding light for the free software movement, fighting for user
-freedom.</strong></p>
+<p><strong>30å¹´éãããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³ã¯ãã¦ã¼ã¶ã®èªç±ã®ããã«éããèªç±ã½ããã¦ã§ã¢éåã®å°çã¨ãã¦å
ãç¶ãã¦ã¾ããã¾ããã</strong></p>
-<p><a href="//www.fsf.org/appeal/">Help keep our light burning brightly</a> by
-donating to push us towards our goal of raising $450,000 by <i>January
-31st</i>.</p>
+<p><a href="//www.fsf.org/appeal/">ããããã¡ã®å
ãæããçãç¶ããã®ãå©ãã¦ãã ãã</a>
+ãå¯ä»ããé¡ããã¾ããããã¦<i>1æ31æ¥</i>ã¾ã§ã«ç®æ¨ã®$450,000ã¾ã§æ¼ãã¦ãã
ããã</p>
<div class="crm-amount-bar"><div class="crm-amount-high">$450k</div>
<div class="crm-amount-fill"><div
class="crm-amount-low"><!--#echo var="amount" -->
-k so far</div></div>
+k(ããã¾ã§)</div></div>
</div>
<!-- /crm-amount-bar -->
</div>
Index: server/mirror.ja.html
===================================================================
RCS file: /web/www/www/server/mirror.ja.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/mirror.ja.html 13 Jan 2015 05:32:11 -0000 1.29
+++ server/mirror.ja.html 29 Dec 2015 07:07:10 -0000 1.30
@@ -31,14 +31,13 @@
<p>ããããå¥ã®ãµã¤ããããã©ã¼ãããã¨ãæ¤è¨ãã¦ãã
ãããç¹°ãè¿ãã«ãªãã¾ãããGNUãµã¼ãã®è²
è·ãæ¸ããããã«ã§ãããããã®ãµã¤ãã¯ftp.gnu.orgã®ãã¹ã¦ã®ãã¼ã¿ã¸ã®ã¢ã¯ã»ã¹ãæä¾ãã¾ãã(æä½ã§ã)æ¯æ©ãããããã¡ããã®æ´æ°ãè¡ããããªãã¯(rsyncã§)ã¢ã¯ã»ã¹ãããã¨ãã§ãã¾ãã</p>
<ul>
-<li><tt>rsync://mirrors.ispros.com.bd/gnu/</tt> (ãã³ã°ã©ãã·ã¥)</li>
<li><tt>rsync://gnu.c3sl.ufpr.br/gnu/ftp/</tt> (ãã©ã¸ã«)</li>
+<li><tt>rsync://mirrors.ocf.berkeley.edu/gnu/</tt>
(ã«ã«ãã©ã«ãã¢ãUSA)</li>
<li><tt>rsync://ftp.hawo.stw.uni-erlangen.de/gnu</tt> (ãã¤ã)</li>
<li><tt>rsync://ftp.funet.fi/ftp/pub/gnu/prep/</tt> (ãã£ã³ã©ã³ã)</li>
<li><tt>rsync://mirror.team-cymru.org/gnu/</tt> (ã¤ãªãã¤ãUSA)</li>
-<li><tt>rsync://mirror.arbitrary.nl/gnu/</tt> (ãªã©ã³ã)</li>
<li><tt>rsync://mirrors.ibiblio.org/gnuftp/</tt>
(ãã¼ã¹ã»ã«ãã©ã¤ããUSA)</li>
-<li><tt>rsync://mirror.uber.com.au/gnu</tt> (ãªã¼ã¹ãã©ãªã¢)</li>
+<li><tt>rsync://uberglobalmirror.com/gnu</tt> (ãªã¼ã¹ãã©ãªã¢)</li>
<li><tt>rsync://ftp-gnu-org.ip-connect.vn.ua/ftp.gnu.org/</tt>
(ã¦ã¯ã©ã¤ã)</li>
</ul>
@@ -181,7 +180,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
@@ -195,11 +194,11 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 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">
@@ -210,7 +209,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/01/13 05:32:11 $
+$Date: 2015/12/29 07:07:10 $
<!-- timestamp end -->
</p>
Index: server/sitemap.ja.html
===================================================================
RCS file: /web/www/www/server/sitemap.ja.html,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- server/sitemap.ja.html 14 Dec 2015 18:01:21 -0000 1.245
+++ server/sitemap.ja.html 29 Dec 2015 07:07:10 -0000 1.246
@@ -627,7 +627,7 @@
<dd>John Bokmaã®GNUãã´</dd>
<dt><a
href="/graphics/bold-initiative-GNU-head.html">bold-initiative-GNU-head.html</a></dt>
- <dd>Winking GNU</dd>
+ <dd>ã¦ã£ã³ã¯ããGNU</dd>
<dt><a href="/graphics/BVBN.html">BVBN.html</a></dt>
<dd>Vladimir Tsarkovã®GNUã¢ã¼ã</dd>
<dt><a href="/graphics/bwcartoon.html">bwcartoon.html</a></dt>
@@ -730,7 +730,7 @@
<dt><a href="/graphics/scowcroft.html">scowcroft.html</a></dt>
<dd>GNUãã£ã©ã¯ã¿</dd>
<dt><a href="/graphics/skwetu-gnu-logo.html">skwetu-gnu-logo.html</a></dt>
- <dd>Skwetu's GNU Logo</dd>
+ <dd>Skwetuã®GNUãã´</dd>
<dt><a href="/graphics/slickgnu.html">slickgnu.html</a></dt>
<dd>Brian Bushã«ããå¦æã®ãªãGNUãã´</dd>
<dt><a href="/graphics/social.html">social.html</a></dt>
@@ -1965,7 +1965,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/12/14 18:01:21 $
+$Date: 2015/12/29 07:07:10 $
<!-- timestamp end -->
</p>
Index: server/po/body-include-2.ja.po
===================================================================
RCS file: /web/www/www/server/po/body-include-2.ja.po,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/po/body-include-2.ja.po 29 Dec 2015 06:27:12 -0000 1.91
+++ server/po/body-include-2.ja.po 29 Dec 2015 07:07:10 -0000 1.92
@@ -26,8 +26,8 @@
"guiding light for the free software movement, fighting for user freedom.</"
"strong>"
msgstr ""
-"<strong>30å¹´éãããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³ã¯ãã¦ã¼ã¶ã®èªç±ã®ããã«éãã"
-"èªç±ã½ããã¦ã§ã¢éåã®å°çã¨ãã¦å
ãç¶ãã¦ã¾ããã¾ããã</strong>"
+"<strong>30å¹´éãããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³ã¯ãã¦ã¼ã¶ã®èªç±ã®ããã«"
+"éããèªç±ã½ããã¦ã§ã¢éåã®å°çã¨ãã¦å
ãç¶ãã¦ã¾ããã¾ããã</strong>"
#. type: Content of: <div><p>
msgid ""
@@ -35,8 +35,9 @@
"by donating to push us towards our goal of raising $450,000 by <i>January "
"31st</i>."
msgstr ""
-"<a href=\"//www.fsf.org/appeal/\">ããããã¡ã®å
ãæããçãç¶ããã®ãå©ãã¦ãã ãã</a> "
-"ãå¯ä»ããé¡ããã¾ããããã¦<i>1æ31æ¥</i>ã¾ã§ã«ç®æ¨ã®$450,000ã¾ã§æ¼ãã¦ãã
ããã"
+"<a href=\"//www.fsf.org/appeal/\">ããããã¡ã®å
ãæããçãç¶ããã®ãå©ãã¦"
+"ãã ãã</a>
ãå¯ä»ããé¡ããã¾ããããã¦<i>1æ31æ¥</i>ã¾ã§ã«ç®æ¨ã®$450,000ã¾"
+"ã§æ¼ãã¦ãã ããã"
#. type: Content of: <div><div><div>
msgid "$450k"
Index: server/po/mirror.ja-en.html
===================================================================
RCS file: /web/www/www/server/po/mirror.ja-en.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/po/mirror.ja-en.html 28 Apr 2014 05:28:46 -0000 1.25
+++ server/po/mirror.ja-en.html 29 Dec 2015 07:07:10 -0000 1.26
@@ -36,14 +36,13 @@
access them with (via rsync):</p>
<ul>
-<li><tt>rsync://mirrors.ispros.com.bd/gnu/</tt> (Bangladesh)</li>
<li><tt>rsync://gnu.c3sl.ufpr.br/gnu/ftp/</tt> (Brazil)</li>
+<li><tt>rsync://mirrors.ocf.berkeley.edu/gnu/</tt> (California, USA)</li>
<li><tt>rsync://ftp.hawo.stw.uni-erlangen.de/gnu</tt> (Germany)</li>
<li><tt>rsync://ftp.funet.fi/ftp/pub/gnu/prep/</tt> (Finland)</li>
<li><tt>rsync://mirror.team-cymru.org/gnu/</tt> (Illinois, USA)</li>
-<li><tt>rsync://mirror.arbitrary.nl/gnu/</tt> (Netherlands)</li>
<li><tt>rsync://mirrors.ibiblio.org/gnuftp/</tt> (North Carolina, USA)</li>
-<li><tt>rsync://mirror.uber.com.au/gnu</tt> (Australia)</li>
+<li><tt>rsync://uberglobalmirror.com/gnu </tt> (Australia)</li>
<li><tt>rsync://ftp-gnu-org.ip-connect.vn.ua/ftp.gnu.org/</tt> (Ukraine)</li>
</ul>
@@ -218,7 +217,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
@@ -233,17 +232,17 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 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/04/28 05:28:46 $
+$Date: 2015/12/29 07:07:10 $
<!-- timestamp end -->
</p>
</div>
Index: server/po/sitemap.ja-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.ja-en.html,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/po/sitemap.ja-en.html 12 Nov 2015 04:58:18 -0000 1.102
+++ server/po/sitemap.ja-en.html 29 Dec 2015 07:07:10 -0000 1.103
@@ -627,6 +627,8 @@
<dd>Baby GNU</dd>
<dt><a href="/graphics/bokma-gnu.html">bokma-gnu.html</a></dt>
<dd>John Bokma's GNU Logos</dd>
+ <dt><a
href="/graphics/bold-initiative-GNU-head.html">bold-initiative-GNU-head.html</a></dt>
+ <dd>Winking GNU</dd>
<dt><a href="/graphics/BVBN.html">BVBN.html</a></dt>
<dd>GNU Art by Vladimir Tsarkov</dd>
<dt><a href="/graphics/bwcartoon.html">bwcartoon.html</a></dt>
@@ -727,6 +729,8 @@
<dd>GNU banner: run free run GNU</dd>
<dt><a href="/graphics/scowcroft.html">scowcroft.html</a></dt>
<dd>GNU Characters</dd>
+ <dt><a href="/graphics/skwetu-gnu-logo.html">skwetu-gnu-logo.html</a></dt>
+ <dd>Skwetu's GNU Logo</dd>
<dt><a href="/graphics/slickgnu.html">slickgnu.html</a></dt>
<dd>A slick GNU logo by Brian Bush</dd>
<dt><a href="/graphics/social.html">social.html</a></dt>
@@ -834,6 +838,8 @@
<dd>GNU Affero General Public License</dd>
<dt><a
href="/licenses/autoconf-exception-3.0.html">autoconf-exception-3.0.html</a></dt>
<dd>Autoconf Configure Script Exception</dd>
+ <dt><a href="/licenses/bsd.html">bsd.html</a></dt>
+ <dd>The BSD License Problem</dd>
<dt><a href="/licenses/copyleft.html">copyleft.html</a></dt>
<dd>What is Copyleft?</dd>
<dt><a href="/licenses/dsl.html">dsl.html</a></dt>
@@ -1066,8 +1072,6 @@
<dd>Bill Gates and Other Communists</dd>
<dt><a href="/philosophy/boldrin-levine.html">boldrin-levine.html</a></dt>
<dd>Review: Boldrin and Levine, “The case against intellectual
property”</dd>
- <dt><a href="/philosophy/bsd.html">bsd.html</a></dt>
- <dd>The BSD License Problem</dd>
<dt><a
href="/philosophy/bug-nobody-allowed-to-understand.html">bug-nobody-allowed-to-understand.html</a></dt>
<dd>The Bug Nobody is Allowed to Understand</dd>
<dt><a href="/philosophy/can-you-trust.html">can-you-trust.html</a></dt>
@@ -1885,7 +1889,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/11/12 04:58:18 $
+$Date: 2015/12/29 07:07:10 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/self-interest.ru.html
===================================================================
RCS file: philosophy/self-interest.ru.html
diff -N philosophy/self-interest.ru.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/self-interest.ru.html 29 Dec 2015 07:07:07 -0000 1.1
@@ -0,0 +1,224 @@
+<!--#set var="ENGLISH_PAGE" value="/philosophy/self-interest.en.html" -->
+
+<!--#include virtual="/server/header.ru.html" -->
+<!-- Parent-Version: 1.77 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>ÐиÑнÑе инÑеÑеÑÑ - ÐÑÐ¾ÐµÐºÑ GNU - Фонд
Ñвободного пÑогÑаммного обеÑпеÑениÑ</title>
+
+<!--#include virtual="/philosophy/po/self-interest.translist" -->
+<!--#include virtual="/server/banner.ru.html" -->
+<h2>ÐиÑнÑе инÑеÑеÑÑ</h2>
+
+<p><strong>Ðойд ФÑÑÑÑон</strong></p>
+
+<p>
+ÐоÑÑаÑоÑно ли лиÑнÑÑ
инÑеÑеÑов, ÑÑобÑ
оÑганизоваÑÑ ÑвободнÑÑ ÑкономикÑ?</p>
+
+<p>
+ÐоÑоÑкий оÑÐ²ÐµÑ — неÑ. Рмало кÑо из
наиболее извеÑÑнÑÑ
ÑеоÑеÑиков
+Ñвободного ÑÑнка когда-либо дÑмали, ÑÑо
лиÑнÑÑ
инÑеÑеÑов доÑÑаÑоÑно или
+могло Ð±Ñ Ð±ÑÑÑ Ð´Ð¾ÑÑаÑоÑно, ÑÑобÑ
оÑганизоваÑÑ Ð¸Ð»Ð¸ поддеÑживаÑÑ Ð²
долгоÑÑоÑной
+пеÑÑпекÑиве ÑвободнÑÑ ÑкономикÑ. СÑеди
ÑÑиÑ
ÑеоÑеÑиков Ðдам Ð¡Ð¼Ð¸Ñ ÑаÑÑо
+ÑаÑÑмаÑÑиваеÑÑÑ ÐºÐ°Ðº главнÑй ÑилоÑоÑ
лиÑнÑÑ
инÑеÑеÑов. Ркниге, напиÑанной
+Ð´Ð»Ñ Ð¸ÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐºÐ¾ÑоÑого ÑиÑла
заблÑждений об ÑÑении СмиÑа, Ð¼Ñ Ð½Ð°Ñ
одим
+ÑледÑÑÑие ÑоÑмÑлиÑовки взглÑдов СмиÑа на
лиÑнÑе инÑеÑеÑÑ:</p>
+
+<blockquote><p>
+Ð¡Ð¼Ð¸Ñ Ð½Ðµ ÑолÑко не бÑл индивидÑалиÑÑом, он
бÑл Ñбежден, ÑÑо именно влиÑние
+обÑеÑÑва пÑевÑаÑÐ°ÐµÑ Ð»Ñдей в ÑÑÑеÑÑва
моÑалÑнÑе. Ðн ÑÑиÑал, ÑÑо лÑди ÑаÑÑо
+невеÑно ÑÑдÑÑ Ð¾ ÑобÑÑвеннÑÑ
лиÑнÑÑ
инÑеÑеÑаÑ
.
+</p></blockquote>
+
+<p>
+ÐÑе ближе к Ñеме:</p>
+
+<blockquote><p>
+[Ðдам СмиÑ] ÑÑиÑал попÑÑки обÑÑÑнÑÑÑ
вÑÑкое поведение лÑдей на оÑнове лиÑнÑÑ
+инÑеÑеÑов аналиÑиÑеÑки оÑибоÑнÑми и
нÑавÑÑвенно вÑеднÑми.
+</p></blockquote>
+
+<p>
+[Ðбе ÑиÑаÑÑ Ð²Ð·ÑÑÑ Ñо ÑÑÑаниÑÑ 2 книги
“Ðдам Ð¡Ð¼Ð¸Ñ Ð² Ñвое и в наÑе
+вÑемє, ÐжеÑÑи Ð. ÐÑллеÑ, ÐÑинÑÑон:
ÐздаÑелÑÑÑво ÐÑинÑÑонÑкого
+ÑнивеÑÑиÑеÑа, 1993.]</p>
+
+<p>
+Ðдам СмиÑ, неÑомненно, понимал, ÑÑо лиÑнÑе
инÑеÑеÑÑ ÑÑановÑÑÑÑ Ð¾Ð´Ð½Ð¾Ð¹ из
+важнейÑиÑ
Ñил, оÑганизÑÑÑиÑ
ÑкономиÑеÑкÑÑ
деÑÑелÑноÑÑÑ Ð² лÑбом обÑеÑÑве, но
+ÑÑо веÑно как Ð´Ð»Ñ Ñамого гÑÑбого и
авÑоÑиÑаÑного обÑеÑÑва, Ñак и длÑ
+оÑноÑиÑелÑно Ñвободного и оÑкÑÑÑого.
ÐолÑÑинÑÑво из Ð½Ð°Ñ Ð½Ðµ обÑадовалоÑÑ Ð±Ñ
+ÑомÑ, кÑда завели Ð±Ñ Ð»Ð¸ÑнÑе инÑеÑеÑÑ, не
ÑдеÑживаемÑе Ñважением к дÑÑгим
+ÑÑÑеÑÑвам. Свежий пÑимеÑ: ÑпÑавлÑÑ ÑÑÑаной
в ÑÑеÑб болÑÑинÑÑÐ²Ñ ÑовеÑÑкиÑ
+гÑаждан, ÑÑководиÑели ÐоммÑниÑÑиÑеÑкой
паÑÑии, а Ñакже ÑовеÑÑкиÑ
вооÑÑженнÑÑ
+Ñил и гоÑÑдаÑÑÑвенной безопаÑноÑÑи
пÑеÑледовали Ñвои ÑобÑÑвеннÑе инÑеÑеÑÑ,
+во вÑÑком ÑлÑÑае, как они иÑ
понимали или
недопонимали.</p>
+<p>
+ÐÑеимÑÑеÑÑва пеÑед гÑажданами ÑовеÑÑкиÑ
ÑÑÑан, коÑоÑÑми полÑзовалиÑÑ
+амеÑиканÑÑ — пÑеимÑÑеÑÑва пеÑед
номиналÑно ÑвободнÑми гÑажданами
+РоÑÑии, а Ñакже дÑÑгиÑ
ÑÑÑан ÐоÑÑоÑной
ÐвÑопÑ, коÑоÑÑми Ð¼Ñ Ð¿Ð¾Ð»ÑзÑемÑÑ Ð¸
+ÑейÑаÑ,— ÑÑо пÑеимÑÑеÑÑва обÑеÑÑва,
оÑганизованного Ñак, ÑÑобÑ
+позволиÑÑ Ð±Ð¾Ð»ÑÑÐ¾Ð¼Ñ Ð¿ÑоÑенÑÑ Ð°Ð¼ÐµÑиканÑев
дейÑÑвоваÑÑ Ð½Ð° благо как ÑобÑÑвеннÑÑ
+инÑеÑеÑов, Ñак и в некоÑоÑой ÑÑÑеÑÑвенной
меÑе нÑавÑÑвеннÑÑ
пÑинÑипов. Ð
+оÑганизаÑÐ¸Ñ Ð½Ð°Ñего обÑеÑÑва вÑ
одÑÑ Ð½Ðµ
ÑолÑко наÑи пÑивÑÑки и обÑÑаи, но и
+наÑе позиÑивное пÑаво, Ñакое как авÑоÑÑкое
пÑаво, ко Ð±Ð»Ð°Ð³Ñ Ð¸Ð»Ð¸ ко злÑ, но
+ÑолÑко не нейÑÑалÑно в оÑноÑении
нÑавÑÑвенноÑÑи.</p>
+<p>
+ÐиÑнÑе инÑеÑеÑÑ — ÑÑо не необÑ
одимое
зло, Ñ
оÑÑ Ð¾Ð½Ð¸ могÑÑ
+заÑÑавлÑÑÑ Ð»Ñдей дейÑÑвоваÑÑ Ð¿Ð¾Ð½ÑÑнÑм Ñ
ÑоÑки зÑÐµÐ½Ð¸Ñ Ð½ÑавÑÑвенноÑÑи
+обÑазом. ÐÑÐ±Ð¾Ð²Ñ Ðº Ñебе и как ÑледÑÑвие
ÑазвиÑие лиÑнÑÑ
инÑеÑеÑов
+пÑедÑÑавлÑÐµÑ Ð¾Ð´Ð¸Ð½ из аÑпекÑов ÑÑÑеÑÑва,
ÑвлÑÑÑегоÑÑ Ñакже ÑоÑиалÑнÑм,
+ÑледоваÑелÑно, нÑавÑÑвеннÑм. ÐиÑнÑе
инÑеÑеÑÑ Ñами по Ñебе могÑÑ ÑлÑжиÑÑ
+инÑеÑеÑам нÑавÑÑвенноÑÑи в Ñвободном
обÑеÑÑве пÑи ÑÑловии, ÑÑо обÑеÑÑво
+зиждеÑÑÑ Ð½Ð° надлежаÑиÑ
оÑнованиÑÑ
.
ÐлеменÑÑ ÑÑиÑ
оÑнований вклÑÑаÑÑ Ð² ÑебÑ
+не ÑолÑко наÑеление, ÑазделÑÑÑее
ÑÑÑеÑÑвеннÑй коÑпÑÑ Ð¼Ð¾ÑалÑнÑÑ
обÑÑаев и
+Ñбеждений, но и ÑоÑмалÑнÑе полиÑиÑеÑкие
ÑÑÑÑкÑÑÑÑ, позиÑивное пÑаво и
+пÑинимаемÑе ÑÑдебнÑе ÑеÑениÑ, ÑпоÑобнÑе
поддеÑживаÑÑ ÐºÐ°Ðº обÑеÑÑвеннÑй
+поÑÑдок, Ñак и ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð»Ð¸ÑноÑÑи. Ðогда ÑÑо
налиÑеÑÑвÑÐµÑ Ð¸ когда ÑÑо ÑÑвоено
+оÑновной маÑÑой гÑаждан, лиÑнÑе инÑеÑеÑÑ
ÑоздаÑÑ Ð´Ð²Ð¸Ð¶ÑÑÑÑ ÑилÑ, коÑоÑаÑ
+поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ ÑÑÑекÑивное
ÑÑнкÑиониÑование Ñкономики, не пÑÐ¸Ð²Ð¾Ð´Ñ Ðº
+безнÑавÑÑвеннÑм ÑезÑлÑÑаÑам в Ñелом.
ÐопÑÐ¾Ñ Ð²Ñегда ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом,
+оÑганизовано ли наÑе обÑеÑÑво надлежаÑим
обÑазом в Ñвоем позиÑивном пÑаве и
+обÑÑаÑÑ
, коÑоÑÑм Ð¼Ñ ÑÑим ÑвоиÑ
деÑей и
коÑоÑÑе Ð¼Ñ Ð¿Ð¾Ð´Ð´ÐµÑживаем в ÑамиÑ
Ñебе,
+ÑÑÐ¾Ð±Ñ Ð»Ð¸ÑнÑе инÑеÑеÑÑ Ð¸ нÑавÑÑвеннÑе
пÑинÑÐ¸Ð¿Ñ Ð² обÑем и Ñелом не вÑÑÑпали в
+пÑоÑивоÑеÑие.</p>
+<p>
+Тем, кÑо знаком Ñ ÑовÑеменной маÑемаÑикой
или ÑеÑ
никой пÑогÑаммиÑованиÑ,
+Ð´Ð¾Ð»Ð¶Ð½Ñ Ð½ÑавиÑÑÑÑ ÑекÑÑÑивнÑе и
пÑинÑипиалÑно неÑÑабилÑнÑе взаимодейÑÑвиÑ
+Ð¼ÐµÐ¶Ð´Ñ Ð¼Ð¾ÑалÑÑ Ð»Ð¸ÑноÑÑи и ÑоÑиалÑной
ÑÑÑÑкÑÑÑой. ÐÑÑбо говоÑÑ, лÑди Ñ
+ÑÑÑеÑÑвеннÑми нÑавÑÑвеннÑми ÑбеждениÑми
оÑганизовÑваÑÑ Ð¾Ð±ÑеÑÑва в
+ÑооÑвеÑÑÑвии Ñ ÑÑими ÑбеждениÑми, заÑем
наÑинаÑÑ ÑоÑмиÑоваÑÑ ÑÐ±ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¸
+пÑивÑÑки деÑей, иммигÑанÑов и Ñ. п. в
ÑооÑвеÑÑÑвии Ñ Ñеми же ÑамÑми
+ÑбеждениÑми. ÐÑо вÑегда ÑÑмбÑÑнÑй
иÑÑоÑиÑеÑкий пÑоÑеÑÑ, коÑоÑÑй Ð¼Ð¾Ð¶ÐµÑ Ð´Ð°ÑÑ
+Ñбой или повеÑнÑÑÑ Ð² менее желаÑелÑное
ÑÑÑло. Ðеизбежно вÑÑÐ°ÐµÑ Ð²Ð¾Ð¿ÑоÑ, не
+оÑклонÑемÑÑ Ð»Ð¸ Ð¼Ñ Ð¾Ñ Ð½Ð°Ð´Ð»ÐµÐ¶Ð°Ñего пÑÑи, а
Ñакже наÑколÑко ÑообÑеÑÑво
+ÑÑÑойÑиво, Ñ. е. ÑколÑко нÑжно
возмÑÑений, ÑÑÐ¾Ð±Ñ ÑазÑÑÑиÑÑ Ñо, ÑÑо еÑÑÑ
+Ñ
оÑоÑего в ÑÑом обÑеÑÑве.</p>
+<p>
+Ðногда добÑÑе лÑди ÑеÑаÑÑ, ÑÑо ÑÑо-Ñо ÑÑало
не Ñак и пÑиÑло вÑÐµÐ¼Ñ Ð±Ð¾ÑоÑÑÑÑ
+за нÑавÑÑвеннÑе пÑинÑипÑ, даже еÑли
ÑÑановиÑÑÑ Ð½ÐµÐ¾Ð±Ñ
одимо пожеÑÑвоваÑÑ
+Ñвоими лиÑнÑми инÑеÑеÑами или Ñ
оÑÑ Ð±Ñ
ÑмеÑиÑÑ Ð¸Ñ
. ÐовоÑÑ Ñловами ТомаÑа
+СоÑÑлла, ÑеоÑеÑика Ñвободного ÑÑнка
наÑего вÑемени,</p>
+
+<blockquote><p>
+ÐÑÑÑ, конеÑно, и неÑкономиÑеÑкие ÑенноÑÑи.
Ð Ñамом деле, ÑÑÑеÑÑвÑÑÑ
+<em>ÑолÑко</em> неÑкономиÑеÑкие ÑенноÑÑи.
Ðкономика пÑедÑÑавлÑÐµÑ ÑенноÑÑÑ Ð½Ðµ
+Ñама по Ñебе, а ÑолÑко как меÑод Ñазмена
одной ÑенноÑÑи на дÑÑгÑÑ. ÐÑли
+ÑÑвеÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ “неÑкономиÑеÑкиÑ
ÑенноÑÑÑÑ
” (или, более конкÑеÑно,
+“ÑоÑиалÑнÑÑ
ÑенноÑÑÑÑ
” или
“ÑеловеÑеÑкиÑ
ÑенноÑÑÑÑ
”)
+подÑазÑмеваÑÑ Ð¾ÑÑиÑание ÑеалÑноÑÑи
неÑÑÑÑанимого Ñазмена или иÑклÑÑение
+какой-Ñо конкÑеÑной ÑенноÑÑи из пÑоÑеÑÑа
Ñазмена, Ñо Ñакие алÑÑÑÑиÑÑиÑеÑкие
+Ð¸Ð´ÐµÐ°Ð»Ñ Ð½ÐµÐ»ÑÐ·Ñ Ð¿ÑодемонÑÑÑиÑоваÑÑ Ð»ÑÑÑе,
Ñем оÑказом Ð¾Ñ ÑинанÑового вÑигÑÑÑа
+в инÑеÑеÑаÑ
ÑакиÑ
идеалов. ÐÑо
ÑкономиÑеÑкий Ñазмен. <cite>[Ð¢Ð¾Ð¼Ð°Ñ Ð¡Ð¾ÑÑлл,
+“Ðнание и ÑеÑениє, ÐÑÑ-ÐоÑк: ÐейÑик
бÑкÑ, 1980,
+ÑÑÑ. 79]</cite>
+</p></blockquote>
+
+<p>
+Ð ÑÑом конÑекÑÑе пÑоÑеÑÑÐ¾Ñ Ð¡Ð¾ÑÑлл не
ÑпоÑÐ¸Ñ Ñ Ñеми, кÑо вноÑÐ¸Ñ Ð² лиÑнÑе
+инÑеÑеÑÑ Ñого или иного Ñода моÑалÑнÑÑ
ÑилÑ; он ÑпоÑÐ¸Ñ Ñ Ñеми, кÑо дÑмаеÑ,
+ÑÑо должен бÑÑÑ Ð¿ÑоÑÑой пÑÑÑ ÑеÑоÑмÑ
обÑеÑÑва, коÑоÑое ÑÑÑÐ°Ð´Ð°ÐµÑ ÐºÐ¾Ð½ÐºÑеÑнÑм
+нÑавÑÑвеннÑм недоÑÑаÑком. ÐÑÑÑ Ð´Ð²Ðµ
ÑÑоÑÐ¾Ð½Ñ Ð¼ÐµÐ´Ð°Ð»Ð¸: подÑинение Ñеловека
+лиÑнÑм инÑеÑеÑам Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾ÑÑавиÑÑ ÐµÐ³Ð¾ в
пÑоÑивоÑеÑие нÑавÑÑвеннÑм ÑенноÑÑÑм,
+а попÑÑка ÑледоваÑÑ Ð½ÑавÑÑвеннÑм
ÑенноÑÑÑм Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑивеÑÑи к некоÑоÑÑм
+жеÑÑвам в облаÑÑи ÑобÑÑвеннÑÑ
лиÑнÑÑ
инÑеÑеÑов.</p>
+<p>
+ÐиÑнÑе инÑеÑеÑÑ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¼Ð¾Ñной
движÑÑей Ñилой обÑеÑÑва, по кÑайней меÑе,
+когда гÑаждане обÑеÑÑва Ñ
оÑоÑо
ÑÑоÑмиÑÐ¾Ð²Ð°Ð½Ñ ÐºÐ°Ðº лиÑноÑÑи, но в лиÑнÑÑ
+инÑеÑеÑаÑ
Ð½ÐµÑ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ
ÑаинÑÑвеннÑÑ
или
волÑебнÑÑ
аÑпекÑов, коÑоÑÑе
+гаÑанÑиÑовали Ð±Ñ Ð½ÑавÑÑвеннÑе ÑезÑлÑÑаÑÑ.
ÐиÑнÑе инÑеÑеÑÑ Ð¿ÑиводÑÑ Ð² обÑем и
+Ñелом к нÑавÑÑвеннÑм ÑезÑлÑÑаÑам в Ñой
меÑе, в какой моÑалÑнÑе ÑÑÑои,
+внеÑние, но по болÑÑей ÑаÑÑи внÑÑÑенние,
напÑавлÑÑÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ Ð»Ð¸Ñно
+заинÑеÑеÑованнÑÑ
ÑÑоÑон. ÐбÑеÑÑво Ñ
надлежаÑими ÑÑÑоÑми воплоÑаеÑÑÑ Ð² жизнÑ
+не по какомÑ-Ñо волÑебÑÑвÑ, а поÑÑедÑÑвом
дейÑÑвий лÑдей, движÑÑиÑ
ÑÑ Ðº
+вÑÑÑей Ñели, бÑÐ´Ñ Ñо оÑ
Ñана ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð²
обÑеÑÑве в Ñелом или оÑ
Ñана дÑÑ
а
+ÑоÑÑÑдниÑеÑÑва в ÑообÑеÑÑваÑ
пÑогÑаммиÑÑов, а Ñо и одновÑеменно и к Ñой,
и к
+дÑÑгой.</p>
+
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.ru.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>ÐожалÑйÑÑа, пÑиÑÑлайÑе обÑие запÑоÑÑ
ÑÐ¾Ð½Ð´Ñ Ð¸ GNU по адÑеÑÑ <a
+href="mailto:address@hidden"><address@hidden></a>. ÐÑÑÑ Ñакже <a
+href="/contact/">дÑÑгие ÑпоÑÐ¾Ð±Ñ ÑвÑзаÑÑÑÑ</a> Ñ
Ñондом. ÐÑÑеÑÑ Ð¾
+неÑабоÑаÑÑиÑ
ÑÑÑлкаÑ
и дÑÑгие попÑавки
или пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ пÑиÑÑлаÑÑ Ð¿Ð¾
+адÑеÑÑ <a href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+ÐÑ ÑÑаÑалиÑÑ ÑделаÑÑ ÑÑÐ¾Ñ Ð¿ÐµÑевод ÑоÑнÑм и
каÑеÑÑвеннÑм, но иÑклÑÑиÑÑ
+возможноÑÑÑ Ð¾Ñибки Ð¼Ñ Ð½Ðµ можем.
ÐÑиÑÑлайÑе, пожалÑйÑÑа, Ñвои замеÑÐ°Ð½Ð¸Ñ Ð¸
+пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ пеÑÐµÐ²Ð¾Ð´Ñ Ð¿Ð¾ адÑеÑÑ <a
+href="mailto:address@hidden"><address@hidden></a>.
+</p><p>Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ кооÑдинаÑии и
пÑедложениÑм пеÑеводов наÑиÑ
ÑÑаÑей Ñм. в
+<a href="/server/standards/README.translations.html">“Ð
ÑководÑÑве по
+пеÑеводам”</a>.</p>
+</div>
+
+<!-- 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 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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright © 1998 Loyd Fueston <a
+href="mailto:address@hidden"><address@hidden></a><br />Copyright
+© 2015 Free Software Foundation, Inc. (translation)</p>
+
+<p>Verbatim copying and distribution of this entire article are permitted in
+any medium, provided this notice is preserved. </p><p> (ÐÑквалÑное
+копиÑование и ÑаÑпÑоÑÑÑанение вÑей ÑÑой
ÑÑаÑÑи ÑазÑеÑено на лÑбом ноÑиÑеле
+пÑи ÑÑловии, ÑÑо ÑÑо Ñведомление ÑоÑ
ÑанÑеÑÑÑ)</p>
+
+<!--#include virtual="/server/bottom-notes.ru.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<em>Ðнимание! РподгоÑовке ÑÑого пеÑевода
ÑÑаÑÑвовал ÑолÑко один Ñеловек. ÐÑ
+можеÑе ÑÑÑеÑÑвенно ÑлÑÑÑиÑÑ Ð¿ÐµÑевод, еÑли
пÑовеÑиÑе его и ÑаÑÑкажеÑе о
+найденнÑÑ
оÑибкаÑ
в <a
+href="http://savannah.gnu.org/projects/www-ru">ÑÑÑÑкой гÑÑппе
пеÑеводов
+gnu.org</a>.</em></div>
+
+<p class="unprintable"><!-- timestamp start -->
+Ðбновлено:
+
+$Date: 2015/12/29 07:07:07 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: philosophy/po/self-interest.ru-en.html
===================================================================
RCS file: philosophy/po/self-interest.ru-en.html
diff -N philosophy/po/self-interest.ru-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/self-interest.ru-en.html 29 Dec 2015 07:07:07 -0000
1.1
@@ -0,0 +1,200 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>Self-Interest
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/philosophy/po/self-interest.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Self-Interest</h2>
+
+<p>by <strong>Loyd Fueston</strong></p>
+
+<p>
+Is Self-Interest Sufficient to Organize a Free Economy?</p>
+
+<p>
+The quick answer is, “No.” And few of the better-known
+theoreticians of the free-market have ever thought that self-interest
+was, or even could be, sufficient to organize, or long maintain, a
+free economy. Among those theoreticians, Adam Smith is often regarded
+as having been the primary philosopher of self-interest. In a book
+written to correct a number of misunderstandings of Smith's teachings,
+we find the following summaries of Smith's view about
+self-interest:</p>
+
+<blockquote><p>
+Far from being an individualist, Smith believed it is the influence
+of society that transforms people into moral beings. He thought that
+people often misjudge their own self-interest.
+</p></blockquote>
+
+<p>
+Even more directly to the point:</p>
+
+<blockquote><p>
+[Adam Smith] regarded the attempt to explain all human behavior on
+the basis of self-interest as analytically misguided and morally
+pernicious.
+</p></blockquote>
+
+<p>
+[Both quotes are from page 2 of “Adam Smith: In His Time and
+Ours”, Jerry Z. Muller, Princeton: Princeton University Press,
+1993.]</p>
+
+<p>
+As Adam Smith certainly realized, self-interest will be one of the
+principal forces organizing economic activities in any society, but
+that is as true of the most repressive or brutal society as it is of
+a relatively free and open society. Most of us will not like the
+results of self-interest untempered by a respect for other creatures.
+As a recent example, in running their country to the disadvantage of
+most Soviet citizens, the leaders of the Communist Party and of the
+Soviet military and intelligence services were advancing their own
+self-interests, at least as they understood or misunderstood those
+interests.</p>
+<p>
+The advantages enjoyed by Americans over citizens of the Soviet
+countries, and the advantages we still enjoy over the nominally free
+citizens of Russia and other eastern European countries, are those of
+a society organized to allow a high percentage of Americans to act in
+such a way as to serve both their self-interest and some substantial
+stock of moral principles. Not only our habits and customs, but also
+our positive laws — such as those of copyright — enter
+into that organization of our society, for good or bad, but not in a
+morally neutral manner.</p>
+<p>
+Self-interest is not necessarily evil, though it can lead people to act
+in morally reprehensible ways. The love of self, and the consequent
+development of self-interest, is one aspect of a creature who is also
+a social, and hence moral, being. Self-interest itself can serve
+moral interests in a free society so long as that society has the
+proper foundations. The elements of those foundations include not only
+a populace sharing a substantial body of moral beliefs and habits but
+also the formal political structures, positive laws, and accepted
+court decisions capable of supporting both social order and personal
+freedom. Once those are in place, and once they have been
+internalized by the bulk of the citizens, then self-interest will
+provide a fuel of sorts to keep an economy functioning effectively
+without leading to immoral results on the whole. The question is
+always: Is our society organized properly, in its positive laws and
+in the habits we teach our children and reinforce in ourselves, so that
+self-interest and moral principles do not generally come into
+conflict?</p>
+<p>
+Those people aware of modern mathematics or of programming techniques
+should appreciate the recursive, and inherently unstable, interactions
+between individual morality and social structure. To oversimplify in
+a useful manner: People with substantial moral beliefs organize
+societies along those beliefs and those societies then begin to form
+the habits and beliefs of children, immigrants, etc. according to
+those same beliefs. Always, it is a messy historical process which
+can be destroyed or rerouted into less desirable paths. There is
+inevitably a question as to whether we are straying from a proper path
+and also a question as to how robust the society is, i.e., how much
+of a disturbance it would take to destroy much of what is good about that
+society.</p>
+<p>
+Sometimes, good people will decide that something has gone wrong and
+it is time to fight for a moral principle even if it becomes necessary
+to sacrifice, or at least qualify, their own self-interest. In the
+words of Thomas Sowell, a free-market theorist of our time:</p>
+
+<blockquote><p>
+There are, of course, noneconomic values. Indeed, there are
+<em>only</em> noneconomic values. Economics is not a value itself but
+merely a method of trading off one value against another. If
+statements about ‘noneconomic values’ (or, more
+specifically, ‘social values’ or ‘human
+values’) are meant to deny the inherent reality of trade-offs,
+or to exempt some particular value from the trade-off process, then
+such selfless ideals can be no more effectively demonstrated than by
+trading off financial gains in the interest of such ideals. This is an
+economic trade-off. <tt>[from page 79 of “Knowledge &
+Decisions”, Thomas Sowell, New York: Basic Books, 1980.]</tt>
+</p></blockquote>
+
+<p>
+In context, Professor Sowell was not arguing against those imputing
+some sort of moral power to self-interest; he was instead arguing
+against those who think there should be an easy path to the reform of
+a society which may have a particular moral defect. Those are two
+sides to the same coin — serving self-interest may put a person
+in conflict with moral values and the attempt to serve moral values
+may lead to some sacrifice of one's self-interest.</p>
+<p>
+Self-interest can be a powerful fuel for a society, at least when the
+citizens of that society are well-formed individuals, but there is
+no mystical or magical aspect to self-interest that guarantees moral
+results. Self-interest will lead to generally moral results to the
+extent that moral constraints, external but mostly internal, guide
+the actions of the self-interested parties. A society with the proper
+constraints does not come into existence by some act of magic, but
+rather by the acts of people who are aiming at a higher purpose, whether
+the preservation of liberty in the society as a whole or the
+preservation of a cooperative spirit within communities of
+programmers, or maybe both of those at the same time.</p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- 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 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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 1998 Loyd
+Fueston <a href="mailto:address@hidden"><address@hidden></a></p>
+
+<p>Verbatim copying and distribution of this entire article is
+permitted in any medium, provided this notice is preserved.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2015/12/29 07:07:07 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: proprietary/proprietary-deception.ru.html
===================================================================
RCS file: proprietary/proprietary-deception.ru.html
diff -N proprietary/proprietary-deception.ru.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ proprietary/proprietary-deception.ru.html 29 Dec 2015 07:07:08 -0000
1.1
@@ -0,0 +1,129 @@
+<!--#set var="ENGLISH_PAGE" value="/proprietary/proprietary-deception.en.html"
-->
+
+<!--#include virtual="/server/header.ru.html" -->
+<!-- Parent-Version: 1.78 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Ðбман в неÑвободнÑÑ
пÑогÑаммаÑ
-
ÐÑÐ¾ÐµÐºÑ GNU - Фонд Ñвободного пÑогÑаммного
+обеÑпеÑениÑ</title>
+
+<!--#include virtual="/proprietary/po/proprietary-deception.translist" -->
+<!--#include virtual="/server/banner.ru.html" -->
+<h2>Ðбман в неÑвободнÑÑ
пÑогÑаммаÑ
</h2>
+
+<p><a href="/proprietary/proprietary.html">ÐÑÑгие пÑимеÑÑ
вÑедоноÑнÑÑ
+неÑвободнÑÑ
пÑогÑамм</a></p>
+
+<p>Ð ÑÑом докÑменÑе пÑÐ¸Ð²ÐµÐ´ÐµÐ½Ñ Ð¿ÑимеÑÑ,
когда неÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð½ÐµÑеÑÑÐ½Ñ Ð¸Ð»Ð¸
+ÑкÑÑваÑÑ Ð¾Ð±Ð¼Ð°Ð½ или моÑенниÑеÑÑво.</p>
+
+<ul>
+ <li>
+ <p>Ðдна из попÑлÑÑнейÑиÑ
пÑогÑамм,
пÑогÑамма-ÐºÐ»Ð¸ÐµÐ½Ñ Instagram, обеÑавÑаÑ
+ÑообÑаÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑм, кÑо пÑоÑмаÑÑиваеÑ
иÑ
изобÑажениÑ, в дейÑÑвиÑелÑноÑÑи
+<a
+href="http://www.theguardian.com/technology/2015/nov/11/top-ranking-free-app-stole-instagram-passwords">
+воÑовала иÑ
паÑоли</a>, ÑекламиÑовала ÑебÑ
на иÑ
ленÑаÑ
новоÑÑей и ÑазмеÑала
+изобÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð±ÐµÐ· ÑоглаÑÐ¸Ñ Ð¿Ð¾Ð»ÑзоваÑелей.</p>
+ </li>
+ <li>
+ <p>РФолÑкÑваген запÑогÑаммиÑовали
компÑÑÑеÑÑ Ð² двигаÑелÑÑ
ÑвоиÑ
авÑомобилей
на
+обнаÑÑжение ÑеÑÑов вÑÑ
лопнÑÑ
газов,
пÑоводимÑÑ
ÐгенÑÑÑвом по оÑ
Ñане
+окÑÑжаÑÑей ÑÑÐµÐ´Ñ Ð¡Ð¨Ð, и загÑÑзнÑÑÑ Ð²Ð¾Ð·Ð´ÑÑ
вÑе оÑÑалÑное вÑемÑ.</p>
+
+ <p><a
+href="https://www.petri.com/volkswagen-used-software-to-cheat-on-emissions">https://www.petri.com/volkswagen-used-software-to-cheat-on-emissions</a>.</p>
+
+ <p>РнаÑÑоÑÑей ÑабоÑе загÑÑÐ·Ð½ÐµÐ½Ð¸Ñ Ð²ÑÑ
лопов могли пÑевоÑÑ
одиÑÑ Ð´Ð¾Ð¿ÑÑÑимÑе ноÑмÑ
+в 35 Ñаз.</p>
+
+ <p>ÐÑименение ÑвободнÑÑ
пÑогÑамм не
помеÑало Ð±Ñ Ð¤Ð¾Ð»ÑкÑвагенÑ
запÑогÑаммиÑоваÑÑ
+компÑÑÑÐµÑ Ñаким обÑазом, но ÑÑо бÑло бÑ
ÑÑÑднее ÑкÑÑÑÑ.</p>
+ </li>
+</ul>
+
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.ru.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>ÐожалÑйÑÑа, пÑиÑÑлайÑе обÑие запÑоÑÑ
ÑÐ¾Ð½Ð´Ñ Ð¸ GNU по адÑеÑÑ <a
+href="mailto:address@hidden"><address@hidden></a>. ÐÑÑÑ Ñакже <a
+href="/contact/">дÑÑгие ÑпоÑÐ¾Ð±Ñ ÑвÑзаÑÑÑÑ</a> Ñ
Ñондом. ÐÑÑеÑÑ Ð¾
+неÑабоÑаÑÑиÑ
ÑÑÑлкаÑ
и дÑÑгие попÑавки
или пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ пÑиÑÑлаÑÑ Ð¿Ð¾
+адÑеÑÑ <a href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+ÐÑ ÑÑаÑалиÑÑ ÑделаÑÑ ÑÑÐ¾Ñ Ð¿ÐµÑевод ÑоÑнÑм и
каÑеÑÑвеннÑм, но иÑклÑÑиÑÑ
+возможноÑÑÑ Ð¾Ñибки Ð¼Ñ Ð½Ðµ можем.
ÐÑиÑÑлайÑе, пожалÑйÑÑа, Ñвои замеÑÐ°Ð½Ð¸Ñ Ð¸
+пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ пеÑÐµÐ²Ð¾Ð´Ñ Ð¿Ð¾ адÑеÑÑ <a
+href="mailto:address@hidden"><address@hidden></a>.
+</p><p>Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ кооÑдинаÑии и
пÑедложениÑм пеÑеводов наÑиÑ
ÑÑаÑей Ñм. в
+<a href="/server/standards/README.translations.html">“Ð
ÑководÑÑве по
+пеÑеводам”</a>.</p>
+</div>
+
+<!-- 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 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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright © 2015 Free Software Foundation, Inc.</p>
+
+<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
+Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.ru.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<em>Ðнимание! РподгоÑовке ÑÑого пеÑевода
ÑÑаÑÑвовал ÑолÑко один Ñеловек. ÐÑ
+можеÑе ÑÑÑеÑÑвенно ÑлÑÑÑиÑÑ Ð¿ÐµÑевод, еÑли
пÑовеÑиÑе его и ÑаÑÑкажеÑе о
+найденнÑÑ
оÑибкаÑ
в <a
+href="http://savannah.gnu.org/projects/www-ru">ÑÑÑÑкой гÑÑппе
пеÑеводов
+gnu.org</a>.</em></div>
+
+<p class="unprintable"><!-- timestamp start -->
+Ðбновлено:
+
+$Date: 2015/12/29 07:07:08 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: proprietary/po/proprietary-deception.ru-en.html
===================================================================
RCS file: proprietary/po/proprietary-deception.ru-en.html
diff -N proprietary/po/proprietary-deception.ru-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ proprietary/po/proprietary-deception.ru-en.html 29 Dec 2015 07:07:09
-0000 1.1
@@ -0,0 +1,101 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.78 -->
+<title>Proprietary Deception
+- GNU Project - Free Software Foundation</title>
+ <!--#include virtual="/proprietary/po/proprietary-deception.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Proprietary Deception</h2>
+
+<p><a href="/philosophy/proprietary.html">Other examples of proprietary
malware</a></p>
+
+<p>This document reports instances where proprietary software is
+ dishonest or conceals deception or trickery.</p>
+
+<ul>
+ <li>
+ <p>A top-ranking proprietary Instagram client promising to tell
+ users who's been watching their pictures was in reality
+ <a
href="http://www.theguardian.com/technology/2015/nov/11/top-ranking-free-app-stole-instagram-passwords">stealing
their credentials</a>,
+ advertising itself on their feed, and posting images without
+ their consent.</p>
+ </li>
+ <li>
+ <p>Volkswagen programmed its car engine computers to detect the
+ Environmental Protection Agency's emission tests,
+ and run dirty the rest of the time.</p>
+
+ <p><a
href="https://www.petri.com/volkswagen-used-software-to-cheat-on-emissions">https://www.petri.com/volkswagen-used-software-to-cheat-on-emissions</a>.</p>
+
+ <p>In real driving, the cars exceeded emissions standards by a
+ factor of up to 35.</p>
+
+ <p>Using free software would not have stopped Volkswagen from
+ programming it this way, but would have made it harder to
+ conceal.</p>
+ </li>
+</ul>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden"><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- 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 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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 2015 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
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2015/12/29 07:07:09 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www doc/other-free-books.ja.html doc/po/other-f...,
GNUN <=