[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www licenses/translations.ja.html licenses/tran...
From: |
GNUN |
Subject: |
www licenses/translations.ja.html licenses/tran... |
Date: |
Fri, 08 Aug 2014 05:29:16 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/08/08 05:29:16
Modified files:
licenses : translations.ja.html translations.ru.html
licenses/po : translations.ja-en.html translations.ja.po
translations.ru-en.html translations.ru.po
links : links.ja.html
links/po : links.ja-en.html links.ja.po
philosophy : not-ipr.ja.html words-to-avoid.ja.html
philosophy/po : not-ipr.ja-en.html not-ipr.ja.po
words-to-avoid.ja-en.html words-to-avoid.ja.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.ja.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.ru.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ja-en.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ja.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ru-en.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ru.po?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/links/links.ja.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.ja-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/links/po/links.ja.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/not-ipr.ja.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ja.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/not-ipr.ja-en.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/not-ipr.ja.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja-en.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.73&r2=1.74
Patches:
Index: licenses/translations.ja.html
===================================================================
RCS file: /web/www/www/licenses/translations.ja.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- licenses/translations.ja.html 2 Jul 2014 04:57:37 -0000 1.49
+++ licenses/translations.ja.html 8 Aug 2014 05:29:12 -0000 1.50
@@ -276,9 +276,9 @@
<!-- Please keep entries alphabetical by language code RT #908353. -->
<ul>
- <li><!-- RT #700472 -->
+ <li><!-- RT #700472, RT #934653 -->
<code>[ar]</code> <a
-href="http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">ã¢ã©ãã¢èª</a>訳ã®GFDL</li>
+href="http://web.archive.org/web/20131225032212/http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">ã¢ã©ãã¢èª</a>訳ã®GFDL</li>
<li><!-- RT #922239 -->
<code>[fr]</code> <a
href="http://juliensanchez.org/fdl_1_3_fr.html">ãã©ã³ã¹èª</a>訳ã®GFDL</li>
@@ -390,7 +390,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/07/02 04:57:37 $
+$Date: 2014/08/08 05:29:12 $
<!-- timestamp end -->
</p>
Index: licenses/translations.ru.html
===================================================================
RCS file: /web/www/www/licenses/translations.ru.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- licenses/translations.ru.html 10 Jun 2014 15:29:15 -0000 1.58
+++ licenses/translations.ru.html 8 Aug 2014 05:29:13 -0000 1.59
@@ -334,9 +334,9 @@
<!-- Please keep entries alphabetical by language code RT #908353. -->
<ul>
- <li><!-- RT #700472 -->
+ <li><!-- RT #700472, RT #934653 -->
<code>[ar]</code> ÐеÑевод GFDL на <a
-href="http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">аÑабÑкий</a></li>
+href="http://web.archive.org/web/20131225032212/http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">аÑабÑкий</a></li>
<li><!-- RT #922239 -->
<code>[fr]</code> ÐеÑевод GFDL на <a
href="http://juliensanchez.org/fdl_1_3_fr.html">ÑÑанÑÑзÑкий</a></li>
@@ -471,7 +471,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/06/10 15:29:15 $
+$Date: 2014/08/08 05:29:13 $
<!-- timestamp end -->
</p>
Index: licenses/po/translations.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/translations.ja-en.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- licenses/po/translations.ja-en.html 2 Jul 2014 04:57:38 -0000 1.28
+++ licenses/po/translations.ja-en.html 8 Aug 2014 05:29:13 -0000 1.29
@@ -291,8 +291,8 @@
<!-- Please keep entries alphabetical by language code RT #908353. -->
<ul>
- <li><code>[ar]</code> <!-- RT #700472 -->
- <a href="http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">
+ <li><code>[ar]</code> <!-- RT #700472, RT #934653 -->
+ <a
href="http://web.archive.org/web/20131225032212/http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">
Arabic</a> translation of the GFDL</li>
<li><code>[fr]</code> <!-- RT #922239 -->
<a href="http://juliensanchez.org/fdl_1_3_fr.html">
@@ -400,7 +400,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/07/02 04:57:38 $
+$Date: 2014/08/08 05:29:13 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/translations.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.ja.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- licenses/po/translations.ja.po 8 Aug 2014 05:19:27 -0000 1.38
+++ licenses/po/translations.ja.po 8 Aug 2014 05:29:14 -0000 1.39
@@ -426,8 +426,8 @@
"muhammadsaied.webs.com/licenses/ar.fdlv13.html\"> Arabic</a> translation of "
"the GFDL"
msgstr ""
-"<code>[ar]</code> <a
href=\"http://web.archive.org/web/20131225032212/http://muhammadsaied.webs.com/licenses/ar.fdlv13."
-"html\">ã¢ã©ãã¢èª</a>訳ã®GFDL"
+"<code>[ar]</code> <a href=\"http://web.archive.org/web/20131225032212/http://"
+"muhammadsaied.webs.com/licenses/ar.fdlv13.html\">ã¢ã©ãã¢èª</a>訳ã®GFDL"
#. RT #922239
#. type: Content of: <ul><li>
Index: licenses/po/translations.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/translations.ru-en.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- licenses/po/translations.ru-en.html 10 Jun 2014 15:29:16 -0000 1.43
+++ licenses/po/translations.ru-en.html 8 Aug 2014 05:29:14 -0000 1.44
@@ -291,8 +291,8 @@
<!-- Please keep entries alphabetical by language code RT #908353. -->
<ul>
- <li><code>[ar]</code> <!-- RT #700472 -->
- <a href="http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">
+ <li><code>[ar]</code> <!-- RT #700472, RT #934653 -->
+ <a
href="http://web.archive.org/web/20131225032212/http://muhammadsaied.webs.com/licenses/ar.fdlv13.html">
Arabic</a> translation of the GFDL</li>
<li><code>[fr]</code> <!-- RT #922239 -->
<a href="http://juliensanchez.org/fdl_1_3_fr.html">
@@ -400,7 +400,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/06/10 15:29:16 $
+$Date: 2014/08/08 05:29:14 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/translations.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.ru.po,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- licenses/po/translations.ru.po 8 Aug 2014 04:59:09 -0000 1.87
+++ licenses/po/translations.ru.po 8 Aug 2014 05:29:14 -0000 1.88
@@ -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: 2014-08-08 04:25+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -440,20 +439,14 @@
#. RT #700472, RT #934653
#. type: Content of: <ul><li>
-# | <code>[ar]</code> <a
-# | [-href=\"http://muhammadsaied.webs.com/licenses/ar.fdlv13.html\">-]
-# |
{+href=\"http://web.archive.org/web/20131225032212/http://muhammadsaied.webs.com/licenses/ar.fdlv13.html\">+}
-# | Arabic</a> translation of the GFDL
-#| msgid ""
-#| "<code>[ar]</code> <a href=\"http://muhammadsaied.webs.com/licenses/ar."
-#| "fdlv13.html\"> Arabic</a> translation of the GFDL"
msgid ""
"<code>[ar]</code> <a href=\"http://web.archive.org/web/20131225032212/http://"
"muhammadsaied.webs.com/licenses/ar.fdlv13.html\"> Arabic</a> translation of "
"the GFDL"
msgstr ""
-"<code>[ar]</code> ÐеÑевод GFDL на <a
href=\"http://web.archive.org/web/20131225032212/http://"
-"muhammadsaied.webs.com/licenses/ar.fdlv13.html\">аÑабÑкий</a>"
+"<code>[ar]</code> ÐеÑевод GFDL на <a href=\"http://web.archive.org/"
+"web/20131225032212/http://muhammadsaied.webs.com/licenses/ar.fdlv13.html"
+"\">аÑабÑкий</a>"
#. RT #922239
#. type: Content of: <ul><li>
Index: links/links.ja.html
===================================================================
RCS file: /web/www/www/links/links.ja.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- links/links.ja.html 3 Aug 2014 23:56:52 -0000 1.14
+++ links/links.ja.html 8 Aug 2014 05:29:14 -0000 1.15
@@ -118,7 +118,8 @@
<li><a href="http://www.april.org/">APRIL</a></li>
- <li><a
href="http://eupat.ffii.org/patente/">ã¨ã¼ãããã®ã½ããã¦ã§ã¢ç¹è¨±ãã©ã¼ã»ã®ã£ã©ãªã¼</a></li>
+ <li><a
+href="http://ec.europa.eu/internal_market/indprop/docs/comp/replies/appendix44_en.pdf">ã¨ã¼ãããã®ã½ããã¦ã§ã¢ç¹è¨±ãã©ã¼ã»ã®ã£ã©ãªã¼</a></li>
<li><a href="http://eupat.ffii.org/">FFII: ç¹è¨±ã·ã¹ãã
ã®æªç¨ããæ
å ±ã®é©æ°ãå®ã</a></li>
@@ -341,7 +342,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/08/03 23:56:52 $
+$Date: 2014/08/08 05:29:14 $
<!-- timestamp end -->
</p>
Index: links/po/links.ja-en.html
===================================================================
RCS file: /web/www/www/links/po/links.ja-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- links/po/links.ja-en.html 3 Aug 2014 23:56:52 -0000 1.10
+++ links/po/links.ja-en.html 8 Aug 2014 05:29:15 -0000 1.11
@@ -144,7 +144,8 @@
<li><a href="http://www.april.org/">APRIL</a></li>
- <li><a href="http://eupat.ffii.org/patente/">European Software
+ <li><a
href="http://ec.europa.eu/internal_market/indprop/docs/comp/replies/appendix44_en.pdf">
+ European Software
Patent Horror Gallery</a></li>
<li><a href="http://eupat.ffii.org/">FFII: Protecting Information
@@ -395,7 +396,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/08/03 23:56:52 $
+$Date: 2014/08/08 05:29:15 $
<!-- timestamp end -->
</p>
</div>
Index: links/po/links.ja.po
===================================================================
RCS file: /web/www/www/links/po/links.ja.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- links/po/links.ja.po 8 Aug 2014 05:19:27 -0000 1.25
+++ links/po/links.ja.po 8 Aug 2014 05:29:15 -0000 1.26
@@ -308,8 +308,8 @@
"<a href=\"http://ec.europa.eu/internal_market/indprop/docs/comp/replies/"
"appendix44_en.pdf\"> European Software Patent Horror Gallery</a>"
msgstr ""
-"<a
href=\"http://ec.europa.eu/internal_market/indprop/docs/comp/replies/appendix44_en.pdf\">ã¨ã¼ãããã®ã½ããã¦ã§ã¢ç¹è¨±ã"
-"ã©ã¼ã»ã®ã£ã©ãªã¼</a>"
+"<a href=\"http://ec.europa.eu/internal_market/indprop/docs/comp/replies/"
+"appendix44_en.pdf\">ã¨ã¼ãããã®ã½ããã¦ã§ã¢ç¹è¨±ãã©ã¼ã»ã®ã£ã©ãªã¼</a>"
#. type: Content of: <ul><li>
msgid ""
Index: philosophy/not-ipr.ja.html
===================================================================
RCS file: /web/www/www/philosophy/not-ipr.ja.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/not-ipr.ja.html 23 May 2014 06:34:48 -0000 1.31
+++ philosophy/not-ipr.ja.html 8 Aug 2014 05:29:15 -0000 1.32
@@ -37,7 +37,7 @@
</p>
<p>
-ãããã代æ¿æ¡ã®ããã¤ãã¯ããç¥ç財ç£ãã«æ¯ã¹ãã°æ¹åã¨è¨ããããããã¾ããããããã§ããç¥ç財ç£ããä½ãä»ã®ç¨èªã§ç½®ãæããã®ã¯èª¤ãã§ããç°ãªãå称ãã¤ãã¦ããç¨èªãæã¤ããæ·±ãåé¡ã解決ãããã¨ã¯ããã¾ããããã®æ·±ãåé¡ã¨ã¯ãé度ãªä¸è¬åã§ãããç¥ç財ç£ãã¨ãããããªãä¸æ¬ãã«ã§ããä½ãã¯åå¨ããªãã®ã§ããããã¯èæ°æ¥¼ã§ãã人ã
ãããç¥ç財ç£ããé¦å°¾ä¸è²«ããã«ãã´ãªã
ã¨ä¿¡ãè¾¼ãã§ãã¾ãå¯ä¸ã®çç±ã¯ããã®ç¨èªãåºã使ããã¦ããã¨ãããã¨ããããããå°è±¡ãä¸ããããã«éããªãã®ã§ãã
+ãããã代æ¿æ¡ã®ããã¤ãã¯ããç¥ç財ç£ãã«æ¯ã¹ãã°æ¹åã¨è¨ããããããã¾ããããããã§ããç¥ç財ç£ããä½ãä»ã®ç¨èªã§ç½®ãæããã®ã¯èª¤ãã§ããç°ãªãå称ãã¤ãã¦ããç¨èªãæã¤ããæ·±ãåé¡ã解決ãããã¨ã¯ããã¾ããããã®æ·±ãåé¡ã¨ã¯ãé度ãªä¸è¬åã§ãããç¥ç財ç£ãã¨ãããããªãä¸æ¬ãã«ã§ããä½ãã¯åå¨ããªãã®ã§ããããã¯èæ°æ¥¼ã§ãã人ã
ãããç¥ç財ç£ããé¦å°¾ä¸è²«ããã«ãã´ãªã
ã¨ä¿¡ãè¾¼ãã§ãã¾ãå¯ä¸ã®çç±ã¯ããã®ç¨èªãåºã使ããã¦ããã¨ãããã¨ããé¢é£ã®æ³å¾ã«ã¤ãã¦ãããããå°è±¡ãä¸ããããã«éããªãã®ã§ãã
</p>
<p>
@@ -49,11 +49,11 @@
</p>
<p>
-èä½æ¨©æ³ã¯ãªã¼ãµã¼ã·ãããè¸è¡ãæ¨é²ããããã«è¨è¨ãããããèä½ç©ã®è¡¨ç¾æ¹æ³ã®è©³ç´°ãã«ãã¼ãã¾ããç¹è¨±æ³ã¯æç¨ãªã¢ã¤ãã¢ã®å
¬è¡¨ãæ¨é²ãããã¨ãæå³ãã¦ããããã®ä»£åã¨ãã¦ãã®ã¢ã¤ãã¢ãå
¬è¡¨ããè
ã«ä¸æçãªç¬å ãä¸ãã¦ããã®ã§ãããã®ä¾¡æ
¼ã¯ãããåéã®äººã
ã«ã¨ã£ã¦ã¯æã価å¤ãããã§ãããããä»ã®äººã«ã¯ãªãã§ãããã
+ãã¨ãã°ãèä½æ¨©æ³ã¯ãªã¼ãµã¼ã·ãããè¸è¡ãæ¨é²ããããã«è¨è¨ãããããèä½ç©ã®è¡¨ç¾æ¹æ³ã®è©³ç´°ãã«ãã¼ãã¾ããç¹è¨±æ³ã¯æç¨ãªã¢ã¤ãã¢ã®å
¬è¡¨ãæ¨é²ãããã¨ãæå³ãã¦ããããã®ä»£åã¨ãã¦ãã®ã¢ã¤ãã¢ãå
¬è¡¨ããè
ã«ä¸æçãªç¬å ãä¸ãã¦ããã®ã§ãããã®ä¾¡æ
¼ã¯ãããåéã®äººã
ã«ã¨ã£ã¦ã¯æã価å¤ãããã§ãããããä»ã®äººã«ã¯ãªãã§ãããã
</p>
<p>
-対ç
§çã«åæ¨æ³ã¯ãããç¹å®ã®è¡åãæ¨é²ãããã¨ãæå³ãã¦ããã®ã§ã¯ããã¾ãããåæ¨æ³ã¯ãè³¼å
¥è
ã«å¯¾ãã¦å½¼ããä½ãè²·ã£ã¦ããã®ããç¥ãããã¦ããã
ãã§ããããããªããããç¥ç財ç£ãã¨ããç¨èªã«å½±é¿ãããç«æ³è
ã¯ãåæ¨æ³ããåºåããã¤ã³ã»ã³ãã£ããæä¾ããã¹ãã¼ã
ã¸ã¨å¤ãã¦ãã¾ãã¾ããã
+対ç
§çã«åæ¨æ³ã¯ãããç¹å®ã®è¡åãæ¨é²ãããã¨ãæå³ãã¦ããã®ã§ã¯ããã¾ãããåæ¨æ³ã¯ãè³¼å
¥è
ã«å¯¾ãã¦å½¼ããä½ãè²·ã£ã¦ããã®ããç¥ãããã¦ããã
ãã§ããããããªããããç¥ç財ç£ãã¨ããç¨èªã«å½±é¿ãããç«æ³è
ã¯ãåæ¨æ³ããåºåããã¤ã³ã»ã³ãã£ããæä¾ããã¹ãã¼ã
ã¸ã¨å¤ãã¦ãã¾ãã¾ãããããã¦ããã®ç¨èªãæãã®ã¯ãããããããæ³å¾ã®ãã¡ã®ãã
ãã®ä¸ã¤ã ããªã®ã§ãã
</p>
<p>
@@ -61,7 +61,15 @@
</p>
<p>
-人ã
ã¯ãã°ãã°ããç¥ç財ç£ãã¨ããè¨èããå®éã«ã¯ãã®è¨èãæã示ãããåºããçãã«ãã´ãªãæå³ããã®ã«ä½¿ãã¾ãããã¨ãã°ãå¯è£ãªå½ã
ã¯ãã°ãã°è²§ããå½ã
ã«ä¸å
¬æ£ãªæ³å¾ã課ãã¦å½¼ãããéããããã¨ããã¨ãã¾ããããããã£ãæ³å¾ã®ããã¤ãã¯ãç¥ç財ç£ãæ³ã§ãããããã¤ãã¯ããã§ã¯ããã¾ãããããã§ããªãããã®ãããªããå£ãæ¹å¤ãã人ã¯ãã°ãã°ãå½¼ãã«ã¨ã£ã¦é¦´æã¿æ·±ãã¨ããçç±ã§ããããã¹ã¦ã«ãç¥ç財ç£ãã¨ããã¬ããã«ãè²¼ã£ã¦ãã¾ãã¾ãããã®ç¨èªã使ããã¨ã«ãããå½¼ãã¯åé¡ã®æ¬è³ªã®èª¬æã誤ããã¨ã«ãªãã¾ããæ£ç¢ºãªç¨èªããã¨ãã°ãæ³çæ¤æ°å°åãã¨ãããããªãã®ã®ã»ãããåé¡ã®æ
¸å¿ãè¡ãã¨ããæå³ã§ããåªãã¦ããã®ã§ãã
+å®éãããªããåºä¼ããç¥ç財ç£ãã使ã£ã¦æ§æãããã»ã¨ãã©ãã¹ã¦ã®æç«
ã¯ãå½ãã§ãããããã¨ãã°ãããã®ãç®çã¯ãé©æ°ãä¿é²ãããã¨ã®ä¸»å¼µã«ä¼ãã§ããããããããããã¯ãç¹è¨±æ³ã«ã
ãé©åãããã®ã§ã(ããããæ§ã
ãªç¬å
ãçã¿ã¾ãã)ãèä½æ¨©æ³ã¯é©æ°ã«ã¯é¢ä¿ããã¾ãããæµè¡æãå°èª¬ã¯é©æ°çã§ã¯ã¾ã£ãããªãã¨ãèä½ç©ã¨ãªãå¾ã¾ããåæ¨ã®æ³ã¯é©æ°ã«ã¯é¢ä¿ããã¾ããããããã“rms
+tea”ã¨å¼ã¶ãè¶ã®åºãå§ããå
´åãã»ãã®çã¨åãããæ¹ã§åããè¶ã売ã£ãã¨ãã¦ãããã¯ç¢ºåºã¨ããåæ¨ã§ãããããã¬ã¼ãã·ã¼ã¯ã¬ããã®æ³ã¯ãæ¥ããå
´åãé¤ãã¦é©æ°ã«ã¯é¢ä¿ããã¾ããããããã®ãè¶ã®é¡§å®¢ã®ãªã¹ãã¯ãé©æ°ã¨ä½ã®é¢ä¿ããªãã¨ããã¬ã¼ãã·ã¼ã¯ã¬ããã§ãããã</p>
+
+<p>
+ãç¥ç財ç£ãã¯ãåµé
æ§ãã«é¢ä¿ããã¨ãã決ãä»ãã«åºä¼ãã§ããããããããããã¯å®ã«èä½æ¨©æ³ã«ã
ãé©åãããã®ã§ããç¹è¨±å¯è½ãªçºæã¨ããã«ã¯åµé
æ§ä»¥ä¸ã®ãã®ãå¿
è¦ã§ããåæ¨ã®æ³ã¨ãã¬ã¼ãã·ã¼ã¯ã¬ããã®æ³ã¯åµé
æ§ã«ã¯ãªãã®é¢ä¿ãããã¾ããã“rms
+tea”ã®ååã«ãããããã®ç§å¯ã®ãè¶ã®é¡§å®¢ã®ãªã¹ãã«ãã¾ã£ããåµé
æ§ã®ããããããã¾ããã</p>
+
+<p>
+人ã
ã¯ãã°ãã°ããç¥ç財ç£ãã¨ããè¨èããå®éã«ã¯ãã®è¨èãæã示ãããåºããçãæ³å¾ã®éåãæå³ããã®ã«ä½¿ãã¾ãããã¨ãã°ãå¯è£ãªå½ã
ã¯ãã°ãã°è²§ããå½ã
ã«ä¸å
¬æ£ãªæ³å¾ã課ãã¦å½¼ãããéããããã¨ããã¨ãã¾ããããããã£ãæ³å¾ã®ããã¤ãã¯ãç¥ç財ç£ãæ³ã§ãããããã¤ãã¯ããã§ã¯ããã¾ãããããã§ããªãããã®ãããªããå£ãæ¹å¤ãã人ã¯ãã°ãã°ãå½¼ãã«ã¨ã£ã¦é¦´æã¿æ·±ãã¨ããçç±ã§ããããã¹ã¦ã«ãç¥ç財ç£ãã¨ããã¬ããã«ãè²¼ã£ã¦ãã¾ãã¾ãããã®ç¨èªã使ããã¨ã«ãããå½¼ãã¯åé¡ã®æ¬è³ªã®èª¬æã誤ããã¨ã«ãªãã¾ããæ£ç¢ºãªç¨èªããã¨ãã°ãæ³çæ¤æ°å°åãã¨ãããããªãã®ã®ã»ãããåé¡ã®æ
¸å¿ãè¡ãã¨ããæå³ã§ããåªãã¦ããã®ã§ãã
</p>
<p>
@@ -73,7 +81,7 @@
</p></blockquote>
<p>
-ãã®ä¸»å¼µãè¨åãã¦ããã®ã¯ã¢ã¡ãªã«åè¡å½æ²æ³ã®ç¬¬1æ¡ç¬¬8ç¯ç¬¬8é
ã§ãããã§ã¯èä½æ¨©æ³ãç¹è¨±æ³ãæ£å½åãã¦ãã¾ããããããã®é
ã¯ãåæ¨æ³ãä»ã®æ³å¾ã¨ã¯ä½ã®é¢ä¿ãããã¾ããããç¥ç財ç£ãã¨ããç¨èªã®ããã«ããã®ææã¯ééã£ãä¸è¬åããã¦ãã¾ããã¨ã«ãªã£ãã®ã§ãã
+ãã®ä¸»å¼µãè¨åãã¦ããã®ã¯ã¢ã¡ãªã«åè¡å½æ²æ³ã®ç¬¬1æ¡ç¬¬8ç¯ç¬¬8é
ã§ãããã§ã¯èä½æ¨©æ³ãç¹è¨±æ³ãæ£å½åãã¦ãã¾ããããããã®é
ã¯ãåæ¨æ³ããã¬ã¼ãã·ã¼ã¯ã¬ããæ³ãã¾ãã¯ãã»ãã®æ³å¾ã¨ã¯ä½ã®é¢ä¿ãããã¾ããããç¥ç財ç£ãã¨ããç¨èªã®ããã«ããã®ææã¯ééã£ãä¸è¬åããã¦ãã¾ããã¨ã«ãªã£ãã®ã§ãã
</p>
<p>
@@ -182,7 +190,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/05/23 06:34:48 $
+$Date: 2014/08/08 05:29:15 $
<!-- 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.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- philosophy/words-to-avoid.ja.html 28 Jul 2014 05:57:05 -0000 1.42
+++ philosophy/words-to-avoid.ja.html 8 Aug 2014 05:29:15 -0000 1.43
@@ -22,12 +22,14 @@
<a href="/philosophy/philosophy.html">ãã®ã»ãã®èªã¿ãã®</a> |
ã<a href="#Alternative">代æ¿ç©</a>ã | ã<a
href="#BSD-style">BSDã¹ã¿ã¤ã«</a>ã | ã<a
href="#Closed">ã¯ãã¼ãºã</a>ã | ã<a
href="#CloudComputing">ã¯ã©ã¦ãã»ã³ã³ãã¥ã¼ãã£ã³ã°</a>ã |
ã<a href="#Commercial">åç¨</a>ã | ã<a
href="#Compensation">è£åé</a>ã | ã<a href="#Consume">æ¶è²»</a>ã |
ã<a href="#Consumer">æ¶è²»è
</a>ã | ã<a
href="#Content">ã³ã³ãã³ã</a>ã | ã<a
href="#Creator">ã¯ãªã¨ã¼ã¿ã¼</a>ã | ã<a
href="#DigitalGoods">ãã£ã¸ã¿ã«ä½å</a>ã | ã<a
href="#DigitalLocks">ãã£ã¸ã¿ã«é </a>ã | ã<a
href="#DigitalRightsManagement">ãã£ã¸ã¿ã«æ¨©é管ç</a>ã | ã<a
href="#Ecosystem">ã¨ã³ã·ã¹ãã </a>ã | “<a
href="#FLOSS">FLOSS</a>” | ã<a href="#ForFree">ããªã¼ã§</a>ã |
“<a href="#FOSS">FOSS</a>” | ã<a
href="#FreelyAvailable">ããªã¼ã«å©ç¨å¯è½</a>ã | ã<a
href="#Freeware">ããªã¼ã¦ã§ã¢</a>ã | ã<a
href="#GiveAwaySoftware">ã½ããã¦ã§ã¢ãããã</a>ã | ã<a
href="#Hacker">ããã«ã¼</a>ã | ã<a
href="#IntellectualProperty">ç¥ç財ç£</a>ã | ã<a
href="#LAMP">LAMPã·ã¹ãã </a>ã | ã<a href="#Linux">Linuxã·ã¹ãã
</a>ã | ã<a href="#Market">ãã¼ã±ãã</a>ã | ã<a
href="#Monetize">ããã¿ã¤ãº</a>ã | ã<a
href="#MP3Player">MP3ãã¬ã¤ã¤ã¼</a>ã | ã<a
href="#Open">ãªã¼ãã³</a>ã | ã<a href="#PC">çªç</a>ã | ã<a
href="#Photoshop">ãã©ãã·ã§ãã</a>ã | ã<a
href="#Piracy">æµ·è³è¡çº</a>ã | ã<a
href="#PowerPoint">ãã¯ã¼ãã¤ã³ã</a>ã | ã<a
href="#Protection">ä¿è·</a>ã | “<a href="#RAND">RAND</a>” |
“<a href="#SaaS">SaaS</a>” | ã<a
href="#SellSoftware">ã½ããã¦ã§ã¢ã販売ãã</a>ã | ã<a
href="#SharingEconomy">å
±æçµæ¸</a>ã | ã<a
href="#SoftwareIndustry">ã½ããã¦ã§ã¢ç£æ¥</a>ã | ã<a
href="#SourceModel">ã½ã¼ã¹ã»ã¢ãã«</a>ã | ã<a
href="#Theft">çªç</a>ã | ã<a
href="#TrustedComputing">ãã©ã¹ãããã»ã³ã³ãã¥ã¼ãã£ã³ã°</a>ã
| ã<a href="#Vendor">ãã³ãã¼</a>ã
</p>
-<h4 id="Alternative">ã代æ¿ç©ã |</h4>
+<h4 id="Alternative">ã代æ¿ç©ã</h4>
<p>
-ããããã¡ã¯èªç±ã½ããã¦ã§ã¢ãã代æ¿ç©ãã¨ç¤ºãã¾ããããªããªããããã¯ããããã©ã¤ã¨ã¿ãªã»ã½ããã¦ã§ã¢ã¨ã¨ãã«èªç±ã½ããã¦ã§ã¢ãããã¨ããç®æ¨ã示ãããã§ããããã¯ãããã©ã¤ã¨ã¿ãªã»ã½ããã¦ã§ã¢ãæ£å½ã§ããã¨ããåæã«ç«ã£ã¦ãã¾ãã</p>
+ããããã¡ã¯èªç±ã½ããã¦ã§ã¢ãã代æ¿ç©ãã¨ã¯å¼ã³ã¾ããããªããªããããã§ã¯èªç±ã½ããã¦ã§ã¢ã®ã»ãã®ã代æ¿ç©ãã¯å¦¥å½ã§ãã£ã¦ããããã¨å
±åãã¹ãã¨åæããããã§ãããã®è¨èã«ã¯ãããããé¸æã§ããã代æ¿ç©ããããã¨ã¯ãããã¨ã
ã¨ããä»®å®ã®åé¡ãããã¾ãã</p>
<p>
-ã½ããã¦ã§ã¢ãé
å¸ãããã
ä¸ã¤ã®å«ççæ¹æ³ã¯èªç±ã½ããã¦ã§ã¢ã§ããã¨ãããããã¡ã¯èãã¦ãã¾ããã§ããããããããã¡ã®ç®çã¯ãèªç±ã½ããã¦ã§ã¢ãåãªã代æ¿ç©ä»¥ä¸ã®ãã®ã¨ãããã¨ã§ããããããã¡ã®ç®æ¨ã¯ããã¹ã¦ã®ã¦ã¼ã¶ãèªç±ã¨ãªããããªããã¹ã¦ã®ããã°ã©ã
ãèªç±ã§ããä¸çã§ãã
+ããããã¡ã¯ãã»ãã®äººã使ãããã«ã½ããã¦ã§ã¢ãæä¾ããã«ã¯ãèªç±ã½ããã¦ã§ã¢ã¨ãã¦ã®é
å¸ãå¯ä¸ã®å«ççãªæ¹æ³ã§ããã¨ä¿¡ãã¦ãã¾ããã»ãã®æ¹æ³ã<a
+href="/philosophy/free-software-even-more-important.html">ä¸èªç±ãªã½ããã¦ã§ã¢</a>ã<a
+href="/philosophy/who-does-that-server-really-serve.html">ã½ããã¦ã§ã¢ä»£æ¿ã¨ãã¦ã®ãµã¼ãã¹</a>ã¯ã¦ã¼ã¶ãå¾å±ããã¾ãããã®ãããªãã®ã¯èªç±ã½ããã¦ã§ã¢ã®ã代æ¿ç©ãã¨ãã¦åå¨ãã¤ã¥ããã¹ãã§ã¯ãªããã¨ããããã¡ã¯ããããã¾ãã
</p>
<h4 id="BSD-style">ãBSDã¹ã¿ã¤ã«ã</h4>
@@ -522,7 +524,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/07/28 05:57:05 $
+$Date: 2014/08/08 05:29:15 $
<!-- timestamp end -->
</p>
Index: philosophy/po/not-ipr.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/not-ipr.ja-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/not-ipr.ja-en.html 12 Apr 2014 13:59:22 -0000 1.20
+++ philosophy/po/not-ipr.ja-en.html 8 Aug 2014 05:29:15 -0000 1.21
@@ -58,7 +58,7 @@
overgeneralization. There is no such unified thing as
“intellectual property”—it is a mirage. The only
reason people think it makes sense as a coherent category is that
-widespread use of the term has misled them.
+widespread use of the term has misled them about the laws in question.
</p>
<p>
@@ -75,11 +75,12 @@
</p>
<p>
-Copyright law was designed to promote authorship and art, and covers
-the details of expression of a work. Patent law was intended to
-promote the publication of useful ideas, at the price of giving the
-one who publishes an idea a temporary monopoly over it—a price
-that may be worth paying in some fields and not in others.
+For instance, copyright law was designed to promote authorship and
+art, and covers the details of expression of a work. Patent law was
+intended to promote the publication of useful ideas, at the price of
+giving the one who publishes an idea a temporary monopoly over
+it—a price that may be worth paying in some fields and not in
+others.
</p>
<p>
@@ -87,7 +88,8 @@
way of acting, but simply to enable buyers to know what they are
buying. Legislators under the influence of the term “intellectual
property”, however, have turned it into a scheme that provides
-incentives for advertising.
+incentives for advertising. And these are just
+three out of many laws that the term refers to.
</p>
<p>
@@ -98,15 +100,37 @@
</p>
<p>
+In practice, nearly all general statements you encounter that are
+formulated using “intellectual property” will be false.
+For instance, you'll see claims that “its” purpose is to
+“promote innovation”, but that only fits patent law and
+perhaps plant variety monopolies. Copyright law is not concerned with
+innovation; a pop song or novel is copyrighted even if there is
+nothing innovative about it. Trademark law is not concerned with
+innovation; if I start a tea store and call it “rms tea”,
+that would be a solid trademark even if I sell the same teas in the
+same way as everyone else. Trade secret law is not concerned with
+innovation, except tangentially; my list of tea customers would be a
+trade secret with nothing to do with innovation.</p>
+
+<p>
+You will also see assertions that “intellectual property”
+is concerned with “creativity”, but really that only fits
+copyright law. More than creativity is needed to make a patentable
+invention. Trademark law and trade secret law have nothing to do with
+creativity; the name “rms tea” isn't creative at all, and
+neither is my secret list of tea customers.</p>
+
+<p>
People often say “intellectual property” when they really
-mean some larger or smaller category. For instance, rich countries
+mean some larger or smaller set of laws. For instance, rich countries
often impose unjust laws on poor countries to squeeze money out of
-them. Some of these laws are “intellectual property” laws,
-and others are not; nonetheless, critics of the practice often grab
-for that label because it has become familiar to them. By using it,
-they misrepresent the nature of the issue. It would be better to use
-an accurate term, such as “legislative colonization”, that
-gets to the heart of the matter.
+them. Some of these laws are among those called “intellectual
+property” laws, and others are not; nonetheless, critics of the
+practice often grab for that label because it has become familiar to
+them. By using it, they misrepresent the nature of the issue. It
+would be better to use an accurate term, such as “legislative
+colonization”, that gets to the heart of the matter.
</p>
<p>
@@ -128,9 +152,9 @@
<p>
That statement refers to Article 1, Section 8, Clause 8 of the US
Constitution, which authorizes copyright law and patent law. That
-clause, though, has nothing to do with trademark law or various
-others. The term “intellectual property” led that
-professor to make false generalization.
+clause, though, has nothing to do with trademark law, trade secret
+law, or various others. The term “intellectual property”
+led that professor to make a false generalization.
</p>
<p>
@@ -269,7 +293,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:59:22 $
+$Date: 2014/08/08 05:29:15 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/not-ipr.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/not-ipr.ja.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/not-ipr.ja.po 8 Aug 2014 04:48:04 -0000 1.21
+++ philosophy/po/not-ipr.ja.po 8 Aug 2014 05:29:16 -0000 1.22
@@ -129,8 +129,8 @@
"ã¤ãã¦ããç¨èªãæã¤ããæ·±ãåé¡ã解決ãããã¨ã¯ããã¾ããããã®æ·±ãåé¡ã¨"
"ã¯ãé度ãªä¸è¬åã§ãããç¥ç財ç£ãã¨ãããããªãä¸æ¬ãã«ã§ããä½ãã¯åå¨ããª"
"ãã®ã§ããããã¯èæ°æ¥¼ã§ãã人ã
ãããç¥ç財ç£ããé¦å°¾ä¸è²«ããã«ãã´ãªã ã¨ä¿¡"
-"ãè¾¼ãã§ãã¾ãå¯ä¸ã®çç±ã¯ããã®ç¨èªãåºã使ããã¦ããã¨ãããã¨ããé¢é£ã®æ³å¾ã«ã¤ãã¦ã"
-"ããããå°è±¡ãä¸ããããã«éããªãã®ã§ãã"
+"ãè¾¼ãã§ãã¾ãå¯ä¸ã®çç±ã¯ããã®ç¨èªãåºã使ããã¦ããã¨ãããã¨ããé¢é£ã®æ³"
+"å¾ã«ã¤ãã¦ãããããå°è±¡ãä¸ããããã«éããªãã®ã§ãã"
#. type: Content of: <p>
msgid ""
@@ -162,11 +162,11 @@
"publishes an idea a temporary monopoly over it—a price that may be "
"worth paying in some fields and not in others."
msgstr ""
-"ãã¨ãã°ãèä½æ¨©æ³ã¯ãªã¼ãµã¼ã·ãããè¸è¡ãæ¨é²ããããã«è¨è¨ãããããèä½ç©ã®è¡¨ç¾æ¹æ³"
-"ã®è©³ç´°ãã«ãã¼ãã¾ããç¹è¨±æ³ã¯æç¨ãªã¢ã¤ãã¢ã®å
¬è¡¨ãæ¨é²ãããã¨ãæå³ãã¦ã"
-"ãããã®ä»£åã¨ãã¦ãã®ã¢ã¤ãã¢ãå
¬è¡¨ããè
ã«ä¸æçãªç¬å ãä¸ãã¦ããã®ã§ãã"
-"ãã®ä¾¡æ ¼ã¯ãããåéã®äººã
ã«ã¨ã£ã¦ã¯æã価å¤ãããã§ãããããä»ã®äººã«ã¯ãªã"
-"ã§ãããã"
+"ãã¨ãã°ãèä½æ¨©æ³ã¯ãªã¼ãµã¼ã·ãããè¸è¡ãæ¨é²ããããã«è¨è¨ãããããèä½ç©"
+"ã®è¡¨ç¾æ¹æ³ã®è©³ç´°ãã«ãã¼ãã¾ããç¹è¨±æ³ã¯æç¨ãªã¢ã¤ãã¢ã®å
¬è¡¨ãæ¨é²ãããã¨ã"
+"æå³ãã¦ããããã®ä»£åã¨ãã¦ãã®ã¢ã¤ãã¢ãå
¬è¡¨ããè
ã«ä¸æçãªç¬å ãä¸ãã¦ã"
+"ãã®ã§ãããã®ä¾¡æ ¼ã¯ãããåéã®äººã
ã«ã¨ã£ã¦ã¯æã価å¤ãããã§ãããããä»ã®"
+"人ã«ã¯ãªãã§ãããã"
#. type: Content of: <p>
msgid ""
@@ -180,8 +180,8 @@
"対ç
§çã«åæ¨æ³ã¯ãããç¹å®ã®è¡åãæ¨é²ãããã¨ãæå³ãã¦ããã®ã§ã¯ããã¾ã"
"ããåæ¨æ³ã¯ãè³¼å
¥è
ã«å¯¾ãã¦å½¼ããä½ãè²·ã£ã¦ããã®ããç¥ãããã¦ããã
ãã§"
"ããããããªããããç¥ç財ç£ãã¨ããç¨èªã«å½±é¿ãããç«æ³è
ã¯ãåæ¨æ³ããåºå"
-"ããã¤ã³ã»ã³ãã£ããæä¾ããã¹ãã¼ã
ã¸ã¨å¤ãã¦ãã¾ãã¾ããã"
-"ããã¦ããã®ç¨èªãæãã®ã¯ãããããããæ³å¾ã®ãã¡ã®ãã
ãã®ä¸ã¤ã ããªã®ã§ãã"
+"ããã¤ã³ã»ã³ãã£ããæä¾ããã¹ãã¼ã
ã¸ã¨å¤ãã¦ãã¾ãã¾ãããããã¦ããã®ç¨èª"
+"ãæãã®ã¯ãããããããæ³å¾ã®ãã¡ã®ãã ãã®ä¸ã¤ã
ããªã®ã§ãã"
#. type: Content of: <p>
msgid ""
@@ -209,14 +209,15 @@
"not concerned with innovation, except tangentially; my list of tea customers "
"would be a trade secret with nothing to do with innovation."
msgstr ""
-"å®éãããªããåºä¼ããç¥ç財ç£ãã使ã£ã¦æ§æãããã»ã¨ãã©ãã¹ã¦ã®æç«
ã¯ãå½ãã§ãããã"
-"ãã¨ãã°ãããã®ãç®çã¯ãé©æ°ãä¿é²ãããã¨ã®ä¸»å¼µã«ä¼ãã§ããããããããããã¯ãç¹è¨±æ³"
-"ã«ã ãé©åãããã®ã§ã(ããããæ§ã
ãªç¬å
ãçã¿ã¾ãã)ãèä½æ¨©æ³ã¯é©æ°ã«ã¯é¢ä¿ããã¾ããã"
-"æµè¡æãå°èª¬ã¯é©æ°çã§ã¯ã¾ã£ãããªãã¨ãèä½ç©ã¨ãªãå¾ã¾ããåæ¨ã®æ³ã¯é©æ°ã«ã¯é¢ä¿ããã¾ããã"
-"ãããã“rms tea”ã¨å¼ã¶ãè¶ã®åºãå§ããå
´åãã»ãã®çã¨åãããæ¹ã§åããè¶"
-"ã売ã£ãã¨ãã¦ãããã¯ç¢ºåºã¨ããåæ¨ã§ãããããã¬ã¼ãã·ã¼ã¯ã¬ããã®æ³ã¯ã"
-"æ¥ããå
´åãé¤ãã¦é©æ°ã«ã¯é¢ä¿ããã¾ããããããã®ãè¶ã®é¡§å®¢ã®ãªã¹ãã¯ã"
-"é©æ°ã¨ä½ã®é¢ä¿ããªãã¨ããã¬ã¼ãã·ã¼ã¯ã¬ããã§ãããã"
+"å®éãããªããåºä¼ããç¥ç財ç£ãã使ã£ã¦æ§æãããã»ã¨ãã©ãã¹ã¦ã®æç«
ã¯ãå½"
+"ãã§ãããããã¨ãã°ãããã®ãç®çã¯ãé©æ°ãä¿é²ãããã¨ã®ä¸»å¼µã«ä¼ãã§ãã"
+"ããããããããã¯ãç¹è¨±æ³ã«ã
ãé©åãããã®ã§ã(ããããæ§ã
ãªç¬å ãçã¿ã¾ã"
+"ã)ãèä½æ¨©æ³ã¯é©æ°ã«ã¯é¢ä¿ããã¾ãããæµè¡æãå°èª¬ã¯é©æ°çã§ã¯ã¾ã£ãããªãã¨"
+"ãèä½ç©ã¨ãªãå¾ã¾ããåæ¨ã®æ³ã¯é©æ°ã«ã¯é¢ä¿ããã¾ããããããã“rms
"
+"tea”ã¨å¼ã¶ãè¶ã®åºãå§ããå
´åãã»ãã®çã¨åãããæ¹ã§åããè¶ã売ã£ã"
+"ã¨ãã¦ãããã¯ç¢ºåºã¨ããåæ¨ã§ãããããã¬ã¼ãã·ã¼ã¯ã¬ããã®æ³ã¯ãæ¥ããå
´å"
+"ãé¤ãã¦é©æ°ã«ã¯é¢ä¿ããã¾ããããããã®ãè¶ã®é¡§å®¢ã®ãªã¹ãã¯ãé©æ°ã¨ä½ã®é¢ä¿"
+"ããªãã¨ããã¬ã¼ãã·ã¼ã¯ã¬ããã§ãããã"
#. type: Content of: <p>
msgid ""
@@ -227,11 +228,11 @@
"name “rms tea” isn't creative at all, and neither is my secret "
"list of tea customers."
msgstr ""
-"ãç¥ç財ç£ãã¯ãåµé
æ§ãã«é¢ä¿ããã¨ãã決ãä»ãã«åºä¼ãã§ããããããããããã¯"
-"å®ã«èä½æ¨©æ³ã«ã
ãé©åãããã®ã§ããç¹è¨±å¯è½ãªçºæã¨ããã«ã¯åµé
æ§ä»¥ä¸ã®ãã®ãå¿
è¦ã§ãã"
-"åæ¨ã®æ³ã¨ãã¬ã¼ãã·ã¼ã¯ã¬ããã®æ³ã¯åµé
æ§ã«ã¯ãªãã®é¢ä¿ãããã¾ããã"
-"“rms
tea”ã®ååã«ãããããã®ç§å¯ã®ãè¶ã®é¡§å®¢ã®ãªã¹ãã«ã"
-"ã¾ã£ããåµé æ§ã®ããããããã¾ããã"
+"ãç¥ç財ç£ãã¯ãåµé
æ§ãã«é¢ä¿ããã¨ãã決ãä»ãã«åºä¼ãã§ããããããããã"
+"ãã¯å®ã«èä½æ¨©æ³ã«ã
ãé©åãããã®ã§ããç¹è¨±å¯è½ãªçºæã¨ããã«ã¯åµé
æ§ä»¥ä¸ã®"
+"ãã®ãå¿
è¦ã§ããåæ¨ã®æ³ã¨ãã¬ã¼ãã·ã¼ã¯ã¬ããã®æ³ã¯åµé
æ§ã«ã¯ãªãã®é¢ä¿ãã"
+"ãã¾ããã“rms
tea”ã®ååã«ãããããã®ç§å¯ã®ãè¶ã®é¡§å®¢ã®ãªã¹ãã«"
+"ãã¾ã£ããåµé æ§ã®ããããããã¾ããã"
#. type: Content of: <p>
msgid ""
@@ -288,9 +289,9 @@
"make a false generalization."
msgstr ""
"ãã®ä¸»å¼µãè¨åãã¦ããã®ã¯ã¢ã¡ãªã«åè¡å½æ²æ³ã®ç¬¬1æ¡ç¬¬8ç¯ç¬¬8é
ã§ãããã§ã¯èä½"
-"権æ³ãç¹è¨±æ³ãæ£å½åãã¦ãã¾ããããããã®é
ã¯ãåæ¨æ³ããã¬ã¼ãã·ã¼ã¯ã¬ããæ³ãã¾ãã¯ãã»ãã®æ³å¾ã¨ã¯ä½ã®é¢ä¿"
-"ãããã¾ããããç¥ç財ç£ãã¨ããç¨èªã®ããã«ããã®ææã¯ééã£ãä¸è¬åããã¦"
-"ãã¾ããã¨ã«ãªã£ãã®ã§ãã"
+"権æ³ãç¹è¨±æ³ãæ£å½åãã¦ãã¾ããããããã®é
ã¯ãåæ¨æ³ããã¬ã¼ãã·ã¼ã¯ã¬ãã"
+"æ³ãã¾ãã¯ãã»ãã®æ³å¾ã¨ã¯ä½ã®é¢ä¿ãããã¾ããããç¥ç財ç£ãã¨ããç¨èªã®ãã"
+"ã«ããã®ææã¯ééã£ãä¸è¬åããã¦ãã¾ããã¨ã«ãªã£ãã®ã§ãã"
#. type: Content of: <p>
msgid ""
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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- philosophy/po/words-to-avoid.ja-en.html 28 Jul 2014 05:57:06 -0000
1.33
+++ philosophy/po/words-to-avoid.ja-en.html 8 Aug 2014 05:29:16 -0000
1.34
@@ -109,16 +109,21 @@
<h4 id="Alternative">“Alternative”</h4>
<p>
-We don't present free software as an “alternative,” because it
-presents a goal of having free software alongside proprietary
-software. That presupposes that proprietary software is
-legitimate.</p>
+We don't describe free software as an “alternative,”
+because that presumes that other “alternatives” to free
+software are legitimate and we should coexist with them. That word
+frames an issue with the assumption that it is good to have lots of
+“alternatives” to choose from.</p>
<p>
-We believe that the only ethical way to distribute software is as free
-software. Thus, we aim to make free software more than an
-alternative. Our goal is a world where all programs are free, so that
-all their users are free.
+We believe that distribution as free software is the only ethical way
+to make software available for others to use. The other methods,
+<a href="/philosophy/free-software-even-more-important.html">nonfree
+software</a>
+and <a href="/philosophy/who-does-that-server-really-serve.html">Service
+as a Software Substitute</a> subjugate their users. We do not think
+that those should continue to exist as “alternatives” to
+free software.
</p>
<h4 id="BSD-style">“BSD-style”</h4>
@@ -971,7 +976,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/07/28 05:57:06 $
+$Date: 2014/08/08 05:29:16 $
<!-- 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.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- philosophy/po/words-to-avoid.ja.po 8 Aug 2014 04:48:04 -0000 1.73
+++ philosophy/po/words-to-avoid.ja.po 8 Aug 2014 05:29:16 -0000 1.74
@@ -239,9 +239,10 @@
"the assumption that it is good to have lots of “alternatives” to "
"choose from."
msgstr ""
-"ããããã¡ã¯èªç±ã½ããã¦ã§ã¢ãã代æ¿ç©ãã¨ã¯å¼ã³ã¾ããããªããªããããã§ã¯èªç±ã½ããã¦ã§ã¢ã®"
-"ã»ãã®ã代æ¿ç©ãã¯å¦¥å½ã§ãã£ã¦ããããã¨å
±åãã¹ãã¨åæããããã§ãããã®è¨èã«ã¯ã"
-"ããããé¸æã§ããã代æ¿ç©ããããã¨ã¯ãããã¨ã
ã¨ããä»®å®ã®åé¡ãããã¾ãã"
+"ããããã¡ã¯èªç±ã½ããã¦ã§ã¢ãã代æ¿ç©ãã¨ã¯å¼ã³ã¾ããããªããªããããã§ã¯èª"
+"ç±ã½ããã¦ã§ã¢ã®ã»ãã®ã代æ¿ç©ãã¯å¦¥å½ã§ãã£ã¦ããããã¨å
±åãã¹ãã¨åæãã"
+"ããã§ãããã®è¨èã«ã¯ãããããé¸æã§ããã代æ¿ç©ããããã¨ã¯ãããã¨ã
ã¨ã"
+"ãä»®å®ã®åé¡ãããã¾ãã"
#. type: Content of: <p>
msgid ""
@@ -252,14 +253,13 @@
"Software Substitute</a> subjugate their users. We do not think that those "
"should continue to exist as “alternatives” to free software."
msgstr ""
-"ããããã¡ã¯ãã»ãã®äººã使ãããã«ã½ããã¦ã§ã¢ãæä¾ããã«ã¯ã"
-"èªç±ã½ããã¦ã§ã¢ã¨ãã¦ã®é
å¸ãå¯ä¸ã®å«ççãªæ¹æ³ã§ããã¨ä¿¡ãã¦ãã¾ãã"
-"ã»ãã®æ¹æ³ã<a href=\"/"
-"philosophy/free-software-even-more-important.html\">ä¸èªç±ãªã½ããã¦ã§ã¢</a>ã"
-"<a href=\"/philosophy/who-does-that-server-really-serve.html\">"
-"ã½ããã¦ã§ã¢ä»£æ¿ã¨ãã¦ã®ãµã¼ãã¹</a>ã¯ã¦ã¼ã¶ãå¾å±ããã¾ãã"
-"ãã®ãããªãã®ã¯èªç±ã½ããã¦ã§ã¢ã®ã代æ¿ç©ãã¨ãã¦åå¨ãã¤ã¥ããã¹ãã§ã¯ãªããã¨"
-"ããããã¡ã¯ããããã¾ãã"
+"ããããã¡ã¯ãã»ãã®äººã使ãããã«ã½ããã¦ã§ã¢ãæä¾ããã«ã¯ãèªç±ã½ããã¦ã§"
+"ã¢ã¨ãã¦ã®é
å¸ãå¯ä¸ã®å«ççãªæ¹æ³ã§ããã¨ä¿¡ãã¦ãã¾ããã»ãã®æ¹æ³ã<a
href="
+"\"/philosophy/free-software-even-more-important.html\">ä¸èªç±ãªã½ããã¦ã§ã¢</"
+"a>ã<a
href=\"/philosophy/who-does-that-server-really-serve.html\">ã½ããã¦ã§"
+"ã¢ä»£æ¿ã¨ãã¦ã®ãµã¼ãã¹</a>ã¯ã¦ã¼ã¶ãå¾å±ããã¾ãããã®ãããªãã®ã¯èªç±ã½ãã"
+"ã¦ã§ã¢ã®ã代æ¿ç©ãã¨ãã¦åå¨ãã¤ã¥ããã¹ãã§ã¯ãªããã¨ããããã¡ã¯ããããã¾"
+"ãã"
#. type: Content of: <h4>
msgid "“BSD-style”"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www licenses/translations.ja.html licenses/tran...,
GNUN <=