[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy po/free-open-overlap.ja.po po/fr...
From: |
GNUN |
Subject: |
www/philosophy po/free-open-overlap.ja.po po/fr... |
Date: |
Fri, 17 Apr 2015 00:29:08 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/04/17 00:29:08
Modified files:
philosophy/po : free-open-overlap.ja.po
free-open-overlap.translist
Added files:
philosophy : free-open-overlap.ja.html
philosophy/po : free-open-overlap.ja-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-open-overlap.ja.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.ja.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.translist?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.ja-en.html?cvsroot=www&rev=1.1
Patches:
Index: po/free-open-overlap.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-open-overlap.ja.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/free-open-overlap.ja.po 17 Apr 2015 00:09:59 -0000 1.1
+++ po/free-open-overlap.ja.po 17 Apr 2015 00:29:08 -0000 1.2
@@ -20,20 +20,21 @@
"How Free Software and Open Source Relate as Categories of Programs - GNU "
"Project - Free Software Foundation"
msgstr ""
-"èªç±ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹ã¯ããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ããã"
-" - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³"
+"èªç±ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹ã¯ããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ããã - "
+"GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³"
#. type: Content of: <h2>
msgid "How Free Software and Open Source Relate as Categories of Programs"
-msgstr "èªç±ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹ã¯ããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ããã"
+msgstr ""
+"èªç±ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹ã¯ããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ããã"
#. type: Content of: <p>
msgid ""
"Here's how <a href=\"/philosophy/open-source-misses-the-point.html\">free "
"software and open source</a> relate as categories of programs:"
msgstr ""
-"ãã¡ãã<a href=\"/philosophy/open-source-misses-the-point.html\">èªç±"
-"ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹</a>ãããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ãããã§ã:"
+"ãã¡ãã<a
href=\"/philosophy/open-source-misses-the-point.html\">èªç±ã½ãã"
+"ã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹</a>ãããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ãããã§ã:"
#. type: Content of: <pre>
#, no-wrap
@@ -84,9 +85,9 @@
"free. If the bottom row were drawn to scale, its text would have to be in a "
"tiny font, perhaps too small to read."
msgstr ""
-"ãªã¼ãã³ã½ã¼ã¹ã®ãã¹ã¦ã®ããã°ã©ã
ã§ã»ãã®å°ããªé¨åãèªç±ã§ã¯ããã¾ããã"
-"ããã®è¡ãæ¯ä¾ãã¦æãã¨ããã°ããããããå°ããã¦èªããªãã»ã©ã"
-"ãã®ããã¹ãã¯æ¥µå°ãã©ã³ãã§ãªããã°ãªããªãã§ãããã"
+"ãªã¼ãã³ã½ã¼ã¹ã®ãã¹ã¦ã®ããã°ã©ã
ã§ã»ãã®å°ããªé¨åãèªç±ã§ã¯ããã¾ãããã"
+"ãã®è¡ãæ¯ä¾ãã¦æãã¨ããã°ããããããå°ããã¦èªããªãã»ã©ããã®ããã¹ãã¯"
+"極å°ãã©ã³ãã§ãªããã°ãªããªãã§ãããã"
#. type: Content of: <p>
msgid ""
@@ -95,9 +96,10 @@
"source code that is free. As of 2013, many Android devices are tyrants, but "
"some are not."
msgstr ""
-"Tivoizationã®ããããã¯<a
href=\"/philosophy/proprietary/proprietary-tyrants.html"
-"\">ãç¬è£è
ãã®ããã¤ã¹</a>ã¯èªç±ãªã½ã¼ã¹ã³ã¼ãããä½ãããä¸èªç±ãªå®è¡å½¢å¼ãå«ã¿ã¾ãã"
-"2013ã®æç¹ã§ãå¤ãã®ã¢ã³ããã¤ãã®ããã¤ã¹ã¯ç¬è£è
ã§ãããããã¤ãã¯éãã¾ãã"
+"Tivoizationã®ããããã¯<a
href=\"/philosophy/proprietary/proprietary-tyrants."
+"html\">ãç¬è£è
ãã®ããã¤ã¹</a>ã¯èªç±ãªã½ã¼ã¹ã³ã¼ãããä½ãããä¸èªç±ãªå®è¡å½¢"
+"å¼ãå«ã¿ã¾ãã2013ã®æç¹ã§ãå¤ãã®ã¢ã³ããã¤ãã®ããã¤ã¹ã¯ç¬è£è
ã§ããããã"
+"ã¤ãã¯éãã¾ãã"
#. type: Content of: <p>
msgid ""
@@ -108,10 +110,10 @@
"those licenses. We don't know whether they are still used."
msgstr ""
"“O”㯓other”(ãã®ã»ã)ã®æå³ã§ãããã°ã©ã
ã®ã½ã¼ã¹ã"
-"ãªã¼ãã³ã½ã¼ã¹ã®ã©ã¤ã»ã³ã¹ã
ãèªç±ã§ã¯ãªããã®ãæãã¾ãã2000å¹´ã¾ããã§ã"
-"ãã®ãããªããã¤ãã®ã©ã¤ã»ã³ã¹ãæ¸ãããããã¤ãã®ããã°ã©ã
ã«ä½¿ããã¾ããã"
-"ãã®ãããªã©ã¤ã»ã³ã¹ã§ãªãªã¼ã¹ãããã½ããã¦ã§ã¢ãè³ã«ãã¦ãããã°ãã"
-"çµã¡ãããããããã¡ã¯ãããããã¾ã
使ããã¦ãããç¥ãã¾ããã"
+"ãªã¼ãã³ã½ã¼ã¹ã®ã©ã¤ã»ã³ã¹ã
ãèªç±ã§ã¯ãªããã®ãæãã¾ãã2000å¹´ã¾ããã§ãã"
+"ã®ãããªããã¤ãã®ã©ã¤ã»ã³ã¹ãæ¸ãããããã¤ãã®ããã°ã©ã
ã«ä½¿ããã¾ãããã"
+"ã®ãããªã©ã¤ã»ã³ã¹ã§ãªãªã¼ã¹ãããã½ããã¦ã§ã¢ãè³ã«ãã¦ãããã°ããçµã¡ã"
+"ããããããã¡ã¯ãããããã¾ã
使ããã¦ãããç¥ãã¾ããã"
#. type: Content of: <p>
msgid "Most nonfree licenses are not open source either."
@@ -154,9 +156,9 @@
msgstr ""
"æ£ç¢ºã§è¯ãå質ã®ç¿»è¨³ãæä¾ããããåªåãã¦ãã¾ãããä¸å®å
¨ãªå ´åããããã¨æ"
"ãã¾ãã翻訳ã«é¢ããã³ã¡ã³ãã¨ææ¡ã¯ã<a
href=\"mailto:address@hidden"
-"org\"><address@hidden></a>ã«ãããããã¾ããããããã¡ã®ã¦ã§ã"
-"ãã¼ã¸ã®ç¿»è¨³ã®èª¿æ´ã¨æåºã«ã¤ãã¦ã¯ã<a
href=\"/server/standards/README."
-"translations.html\">翻訳 README</a>ãã覧ãã ããã"
+"org\"><address@hidden></a>ã«ãããããã¾ãã</p><p>ããããã¡"
+"ã®ã¦ã§ããã¼ã¸ã®ç¿»è¨³ã®èª¿æ´ã¨æåºã«ã¤ãã¦ã¯ã<a
href=\"/server/standards/"
+"README.translations.html\">翻訳 README</a>ãã覧ãã ããã"
#. type: Content of: <div><p>
msgid "Copyright © 2015 Free Software Foundation, Inc."
Index: po/free-open-overlap.translist
===================================================================
RCS file: /web/www/www/philosophy/po/free-open-overlap.translist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/free-open-overlap.translist 18 Jan 2015 23:29:10 -0000 1.7
+++ po/free-open-overlap.translist 17 Apr 2015 00:29:08 -0000 1.8
@@ -6,6 +6,7 @@
<span dir="ltr"><a lang="de" hreflang="de"
href="/philosophy/free-open-overlap.de.html">Deutsch</a> [de]</span>
<span dir="ltr"><a lang="fr" hreflang="fr"
href="/philosophy/free-open-overlap.fr.html">français</a> [fr]</span>
<span dir="ltr"><a lang="it" hreflang="it"
href="/philosophy/free-open-overlap.it.html">italiano</a> [it]</span>
+<span dir="ltr"><a lang="ja" hreflang="ja"
href="/philosophy/free-open-overlap.ja.html">æ¥æ¬èª</a> [ja]</span>
<span dir="ltr"><a lang="ru" hreflang="ru"
href="/philosophy/free-open-overlap.ru.html">ÑÑÑÑкий</a> [ru]</span>
<span dir="ltr"><a lang="uk" hreflang="uk"
href="/philosophy/free-open-overlap.uk.html">ÑкÑаÑнÑÑка</a> [uk]</span>
</p>
Index: free-open-overlap.ja.html
===================================================================
RCS file: free-open-overlap.ja.html
diff -N free-open-overlap.ja.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ free-open-overlap.ja.html 17 Apr 2015 00:29:07 -0000 1.1
@@ -0,0 +1,107 @@
+<!--#set var="ENGLISH_PAGE" value="/philosophy/free-open-overlap.en.html" -->
+
+<!--#include virtual="/server/header.ja.html" -->
+<!-- Parent-Version: 1.77 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>èªç±ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹ã¯ããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ããã - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</title>
+
+<!--#include virtual="/philosophy/po/free-open-overlap.translist" -->
+<!--#include virtual="/server/banner.ja.html" -->
+<h2>èªç±ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹ã¯ããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ããã</h2>
+
+<p>ãã¡ãã<a
+href="/philosophy/open-source-misses-the-point.html">èªç±ã½ããã¦ã§ã¢ã¨ãªã¼ãã³ã½ã¼ã¹</a>ãããã°ã©ã
ã®ã«ãã´ãªã¨ãã¦ã©ãé¢ä¿ãããã§ã:</p>
+
+<pre>
+<code>
+ /----------------------------------------------\
+ / | | \
+ / | | \
+ / | | \
+ | |
+ | ã½ã¼ã¹ã®ã©ã¤ã»ã³ã¹ãGNU *GPL, |
+ | Apache, ãªãªã¸ãã«BSD, ä¿®æ£BSD, |
+èªç± | X11, expat, Python, MPL ãªã©ã§ã |
+ | å®è¡å½¢å¼ã¯tivoizationããã¦ãªã |
ãªã¼ãã³ã½ã¼ã¹
+ | |
+ | |
+ \ | |
+ \ | |
+ \ | | /
+ \---------------------------------------------- /
+ | tivoization (ç¬è£è
) ããã¤ã¹ | O | /
+ ----------------------------------------------/
+</code>
+</pre>
+
+<p>ãªã¼ãã³ã½ã¼ã¹ã®ãã¹ã¦ã®ããã°ã©ã
ã§ã»ãã®å°ããªé¨åãèªç±ã§ã¯ããã¾ãããããã®è¡ãæ¯ä¾ãã¦æãã¨ããã°ããããããå°ããã¦èªããªãã»ã©ããã®ããã¹ãã¯æ¥µå°ãã©ã³ãã§ãªããã°ãªããªãã§ãããã</p>
+
+<p>Tivoizationã®ããããã¯<a
+href="/philosophy/proprietary/proprietary-tyrants.html">ãç¬è£è
ãã®ããã¤ã¹</a>ã¯èªç±ãªã½ã¼ã¹ã³ã¼ãããä½ãããä¸èªç±ãªå®è¡å½¢å¼ãå«ã¿ã¾ãã2013ã®æç¹ã§ãå¤ãã®ã¢ã³ããã¤ãã®ããã¤ã¹ã¯ç¬è£è
ã§ãããããã¤ãã¯éãã¾ãã</p>
+
+<!-- don't link here to the list of nonfree licenses.
+That gives the wrong idea, since most of those are not open source either. -->
+<p>“O”㯓other”(ãã®ã»ã)ã®æå³ã§ãããã°ã©ã
ã®ã½ã¼ã¹ããªã¼ãã³ã½ã¼ã¹ã®ã©ã¤ã»ã³ã¹ã
ãèªç±ã§ã¯ãªããã®ãæãã¾ãã2000å¹´ã¾ããã§ããã®ãããªããã¤ãã®ã©ã¤ã»ã³ã¹ãæ¸ãããããã¤ãã®ããã°ã©ã
ã«ä½¿ããã¾ããããã®ãããªã©ã¤ã»ã³ã¹ã§ãªãªã¼ã¹ãããã½ããã¦ã§ã¢ãè³ã«ãã¦ãããã°ããçµã¡ãããããããã¡ã¯ãããããã¾ã
使ããã¦ãããç¥ãã¾ããã</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.ja.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>FSFããã³GNUã«é¢ããåãåããã¯<a
+href="mailto:address@hidden"><address@hidden></a>ã¾ã§ãé¡ããã¾ã(è±èª)ãFSFã¸ã®é£çµ¡ã¯<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">翻訳
README</a>ãã覧ãã ããã</p>
+</div>
+
+<p>Copyright © 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>
+
+<!--#include virtual="/server/bottom-notes.ja.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+ </div>
+
+<p class="unprintable"><!-- timestamp start -->
+æçµæ´æ°:
+
+$Date: 2015/04/17 00:29:07 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: po/free-open-overlap.ja-en.html
===================================================================
RCS file: po/free-open-overlap.ja-en.html
diff -N po/free-open-overlap.ja-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/free-open-overlap.ja-en.html 17 Apr 2015 00:29:08 -0000 1.1
@@ -0,0 +1,101 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>How Free Software and Open Source Relate as Categories of
+Programs
+- GNU Project - Free Software Foundation</title>
+ <!--#include virtual="/philosophy/po/free-open-overlap.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>How Free Software and Open Source Relate as Categories of Programs</h2>
+
+<p>Here's how <a href="/philosophy/open-source-misses-the-point.html">free
software and open source</a> relate as categories of
+programs:</p>
+
+<pre>
+<code>
+ /----------------------------------------------\
+ / | | \
+ / | | \
+ / | | \
+ | |
+ | Source license is GNU *GPL, Apache, |
+ | original BSD, modified BSD, |
+free | X11, expat, Python, MPL, etc., |
+ | and executable is not tivoized | open source
+ | |
+ | |
+ \ | |
+ \ | |
+ \ | | /
+ \---------------------------------------------- /
+ | tivoized (tyrant) devices | O | /
+ ----------------------------------------------/
+</code>
+</pre>
+
+<p>Among all programs that are open source, only a minuscule fraction
+are not free. If the bottom row were drawn to scale, its text would
+have to be in a tiny font, perhaps too small to read.</p>
+
+<p>Tivoized or <a
href="/philosophy/proprietary/proprietary-tyrants.html">“tyrant”
devices</a> contain nonfree
+executables made from source code that is free. As of 2013, many
+Android devices are tyrants, but some are not.</p>
+
+<!-- don't link here to the list of nonfree licenses.
+That gives the wrong idea, since most of those are not open source either. -->
+
+<p>“O” stands for “other” and refers to
+programs whose source is under licenses which are open source but not
+free. Several such licenses were written around 2000, and they were
+used to release some programs. It has been a long time since we heard
+of software released under those licenses. We don't know whether they
+are still used.</p>
+
+<p>Most nonfree licenses are not open source either.</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>
+
+<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/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2015/04/17 00:29:08 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy po/free-open-overlap.ja.po po/fr...,
GNUN <=