[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www gnu/gnu-linux-faq.ja.html gnu/po/gnu-linux-...
From: |
GNUN |
Subject: |
www gnu/gnu-linux-faq.ja.html gnu/po/gnu-linux-... |
Date: |
Wed, 01 Jul 2015 03:58:27 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/07/01 03:58:27
Modified files:
gnu : gnu-linux-faq.ja.html
gnu/po : gnu-linux-faq.ja-en.html gnu-linux-faq.ja.po
licenses : license-list.ja.html licenses.ja.html
licenses/po : license-list.ja-en.html license-list.ja.po
licenses.ja-en.html licenses.ja.po
server : sitemap.ja.html
server/po : sitemap.ja-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ja.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ja-en.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ja.po?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ja.html?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ja.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja.po?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ja.html?cvsroot=www&r1=1.224&r2=1.225
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ja-en.html?cvsroot=www&r1=1.93&r2=1.94
Patches:
Index: gnu/gnu-linux-faq.ja.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ja.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gnu/gnu-linux-faq.ja.html 3 Jun 2015 01:27:16 -0000 1.36
+++ gnu/gnu-linux-faq.ja.html 1 Jul 2015 03:58:24 -0000 1.37
@@ -397,11 +397,12 @@
<p>
GNU
Hurdã«ã¼ãã«ã¯ãå
åã«å®æãã¾ããã§ãããããããã¡ã¯ãããã§ä½æ¥ããã®ã«æå¿ããã人ã
ã«ã ããããæ¨å¥¨ãã¾ããã§ããããããããã¡ã¯ãGNU
-Hurdã«ã¼ãã«ã§GNUãããã±ã¼ã¸ãããã¨ã¯æ±ºãã¦ããã¾ãããã§ãããDebianã¯ãã®çµã¿åãããDebian
GNU/Hurd
-ã¨ãã¦ããã±ã¼ã¸ãã¦ã¾ãã</p>
+Hurdã«ã¼ãã«ã§GNUãããã±ã¼ã¸ãããã¨ã¯æ±ºãã¦ããã¾ãããã§ãããDebianã¯ãã®çµã¿åãããDebian
+GNU/Hurdã¨ãã¦ããã±ã¼ã¸ãã¦ã¾ãã</p>
<p>
-ããããã¡ã¯ä»ãå
é²çãªSchemeãã¼ã¹ã®ããã±ã¼ã¸ããã¼ã¸ã£GUIXãéçºãã¦ãã¾ããããã¦ãããã«ã¯GNUã·ã¹ãã
ã®ä¸»è¦ãªé¨åãåããã±ã¼ã¸ãããã¨ãå«ã¾ãã¾ãã</p>
+ããããã¡ã¯ä»ãå
é²çãªSchemeãã¼ã¹ã®ããã±ã¼ã¸ããã¼ã¸ã£Guixã¨ãããããã¼ã¹ã¨ãã<a
+href="/software/guix">Guixã·ã¹ãã
ã»ãã£ã¹ããªãã¥ã¼ã·ã§ã³</a>(GuixSD)ã¨å¼ã°ããå®å
¨ãªã·ã¹ãã
ã»ãã£ã¹ããªãã¥ã¼ã·ã§ã³ãéçºãã¦ãã¾ããããã¦ãããã«ã¯GNUã·ã¹ãã
ã®ä¸»è¦ãªé¨åãåããã±ã¼ã¸ãããã¨ãå«ã¾ãã¾ãã</p>
<p>
ããããã¡ã¯“GNU”ã®åã®å
ã«“GNU”ãããã±ã¼ã¸ããæçµã¹ããããè¸ã¿åºãã¦ãã¾ããããããããããGNUã¯ã©ããã£ã種é¡ã®ãã®ããå¤ãããã¨ã¯ããã¾ãããGNUã¯ãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
ã®ä¸ã¤ã§ãã</p>
@@ -552,7 +553,7 @@
<dt id="distronames0">ãããã®ãã£ã¹ããã®éçºè
ã¯ãããã“Foobar
Linux”ã¨å¼ã³ã¾ãããããã¯ã·ã¹ãã
ãä½ã§æ§æããã¦ãããã«ã¤ãã¦ä½ãè¿°ã¹ã¦ã¾ãããããããããããããã«å¼ã¹ã°ããã®ã§ã¯ãªãã§ãããã?
<span class="anchor-reference-id">(<a
-href="#distronames">#distronames0</a>)</span></dt>
+href="#distronames0">#distronames0</a>)</span></dt>
<dd>
ã·ã¹ãã ã“Foobar
Linux”ã¨å¼ã¶ãã¨ã¯ãããã“Linux,”ã®ä¸ç¨®ã§ãããã¨ãæå³ãã人ã
ã¯<a
@@ -743,13 +744,12 @@
class="anchor-reference-id">(<a href="#howmuch">#howmuch</a>)</span></dt>
<dd>
-ãã©ãããããã¯ééã£ã質åã§ãã
+ãã©ãããããã¯æå³ã®ãã質åã§ã¯ããã¾ãããGNUã·ã¹ãã
ã«ã¯æ£ç¢ºãªå¢çããªãããã§ãã
<p>
-é£è¡æ©ã®ãã¼ãã®ãã¹ã¦(ãããã¯ã»ã¨ãã©ãã¹ã¦)ãä¸ã¤ãã¤ç½®ãæãã¦ãåãé£è¡æ©ã§ã¯ãªãã§ãã?
-ããã¯å²å¦çåçã§ãããåæã§ããçãã¯ãããã§ããã§ãããã
+GNUã¯ã³ãã¥ããã£ã«ãã£ã¦ä¿å®ããããªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
ã§ããããã«ã¯ã(ããããã¡ãå
·ä½çãªãªã¹ããä¿å®ãã¦ãã)GNUã½ããã¦ã§ã¢ã»ããã±ã¼ã¸ãããããããã®ãã®ãå«ã¿ã人ã
ã¯å¸¸ã«ãã£ã¨å¤ãã®ããã±ã¼ã¸ãå
ãã¾ãããã®å¤æ´ã«ããããããããã¯GNUã·ã¹ãã
ã®ã¾ã¾ã§ãããLinuxãå
ããã°GNU/Linuxã¨ãªãã¾ããGNUã·ã¹ãã
ã®ä¸é¨ã使ããä¸é¨ãé¤ããã¨ãã¦ããã©ããããã使ã£ã¦ããã¨ããæå³ã®ããæ¹æ³ã¯ãªãã§ãããã</p>
+<p>
+ããã±ã¼ã¸ã®ã¬ãã«ãè¦ãã°ãLinuxã¯GNU/Linuxã·ã¹ãã
ã®ä¸ã§ä¸ã¤ã®éè¦ãªããã±ã¼ã¸ã§ããä¸ã¤ã®éè¦ãªGNUããã±ã¼ã¸ãå«ããã®ã¯ãããããã¡ã®åçã®è¨åã®è¦æ±ãæ£å½åããã®ã«å
åã§ãããã
</p>
-
-<p>GNUã·ã¹ãã
ã¯ãGNUããã¸ã§ã¯ãã«ãã£ã¦ãªãªã¼ã¹ãããããããã®ã³ã³ãã¼ãã³ãã
ãããããã£ã¨å¤§ããªãã®ã§ããGNU/Linuxã®ã»ã¨ãã©ãã¹ã¦ã®ã³ã³ãã¼ãã³ããã»ãã«ç½®ãæãããã¨ãå§ãã¦ãã»ã¨ãã©é¢ä¿ãªãã³ã¼ãã®éåã«éããã¨ãã¦ããããã§ããããGNU/Linuxã·ã¹ãã
ã§ãããã</p>
</dd>
<dt id="helplinus">ã©ã£ã¡ã«ããã·ã¹ãã
ã“Linux”ã¨å¼ãã§ãããããã¡ã®ã³ãã¥ããã£ã®ããã«ãªã¼ãã¹ã»ãã¼ãã«ãºã®åºåå¡ã¨ãã¦ã®å½¹å²ãå¼·åããã°è¯ãã®ã§ã¯?<span
@@ -991,7 +991,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/06/03 01:27:16 $
+$Date: 2015/07/01 03:58:24 $
<!-- 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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- gnu/po/gnu-linux-faq.ja-en.html 3 Jun 2015 01:27:16 -0000 1.31
+++ gnu/po/gnu-linux-faq.ja-en.html 1 Jul 2015 03:58:25 -0000 1.32
@@ -587,8 +587,9 @@
<p>
We are now developing an advanced Scheme-based package manager called
-GUIX, and this includes repackaging a substantial part of the GNU
-system.</p>
+Guix and a complete system distribution based on it called the
+<a href="/software/guix">Guix System Distribution</a> or GuixSD.
+This includes repackaging a substantial part of the GNU system.</p>
<p>
We never took the last step of packaging GNU under the name
@@ -836,7 +837,7 @@
<dt id="distronames0">My distro's developers call it
“Foobar Linux”, but that doesn't say anything about
what the system consists of. Why shouldn't they call it whatever
- they like? <span class="anchor-reference-id">(<a
href="#distronames">#distronames0</a>)</span></dt>
+ they like? <span class="anchor-reference-id">(<a
href="#distronames0">#distronames0</a>)</span></dt>
<dd>
Calling a system “Foobar Linux” implies that it's a flavor
of “Linux,” and people <a href="#distronames">understand
@@ -1173,18 +1174,20 @@
GNU/Linux? <span class="anchor-reference-id">(<a
href="#howmuch">#howmuch</a>)</span></dt>
<dd>
-“How much” is the wrong question.
+“How much” is not a meaningful question because the GNU
+system does not have precise boundaries.
<p>
-If you replace all (or nearly all) of the parts of an airplane, one by
-one, with spares, is it still the same plane? That question is a
-philosophical conundrum, but the agreed answer is “yes.”
+GNU is an operating system maintained by a community. It includes far
+more than just the GNU software packages (of which we have a specific
+list), and people add more packages constantly. Despite these
+changes, it remains the GNU system, and adding Linux to that yields
+GNU/Linux. If you use part of the GNU system and omit part, there is
+no meaningful way to say “how much” you used.</p>
+<p>
+If we look at the level of packages, Linux is one important package in
+the GNU/Linux system. The inclusion of one important GNU package is
+enough to justify our request for equal mention.
</p>
-
-<p>The GNU system is something bigger than just the many components
-that were released by the GNU Project. If you start with GNU/Linux
-replace nearly all the components with others, you may end up with a
-nearly disjoint set of code, but it will still be the GNU/Linux
-system.</p>
</dd>
<dt id="helplinus">Why not call the system
@@ -1524,7 +1527,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/06/03 01:27:16 $
+$Date: 2015/07/01 03:58:25 $
<!-- 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.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- gnu/po/gnu-linux-faq.ja.po 1 Jul 2015 03:42:56 -0000 1.58
+++ gnu/po/gnu-linux-faq.ja.po 1 Jul 2015 03:58:25 -0000 1.59
@@ -1327,10 +1327,10 @@
"software/guix\">Guix System Distribution</a> or GuixSD. This includes "
"repackaging a substantial part of the GNU system."
msgstr ""
-"ããããã¡ã¯ä»ãå
é²çãªSchemeãã¼ã¹ã®ããã±ã¼ã¸ããã¼ã¸ã£Guixã¨ãããããã¼ã¹ã¨ãã"
-"<a href=\"/software/guix\">Guixã·ã¹ãã
ã»ãã£ã¹ããªãã¥ã¼ã·ã§ã³</a>(GuixSD)"
-"ã¨å¼ã°ããå®å
¨ãªã·ã¹ãã
ã»ãã£ã¹ããªãã¥ã¼ã·ã§ã³ãéçºãã¦ãã¾ãã"
-"ããã¦ãããã«ã¯GNUã·ã¹ãã
ã®ä¸»è¦ãªé¨åãåããã±ã¼ã¸ãããã¨ãå«ã¾ãã¾ãã"
+"ããããã¡ã¯ä»ãå
é²çãªSchemeãã¼ã¹ã®ããã±ã¼ã¸ããã¼ã¸ã£Guixã¨ãããããã¼"
+"ã¹ã¨ãã<a href=\"/software/guix\">Guixã·ã¹ãã
ã»ãã£ã¹ããªãã¥ã¼ã·ã§ã³</a>"
+"(GuixSD)ã¨å¼ã°ããå®å
¨ãªã·ã¹ãã
ã»ãã£ã¹ããªãã¥ã¼ã·ã§ã³ãéçºãã¦ãã¾ããã"
+"ãã¦ãããã«ã¯GNUã·ã¹ãã
ã®ä¸»è¦ãªé¨åãåããã±ã¼ã¸ãããã¨ãå«ã¾ãã¾ãã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2577,7 +2577,8 @@
"“How much” is not a meaningful question because the GNU system "
"does not have precise boundaries."
msgstr ""
-"ãã©ãããããã¯æå³ã®ãã質åã§ã¯ããã¾ãããGNUã·ã¹ãã
ã«ã¯æ£ç¢ºãªå¢çããªãããã§ãã"
+"ãã©ãããããã¯æå³ã®ãã質åã§ã¯ããã¾ãããGNUã·ã¹ãã
ã«ã¯æ£ç¢ºãªå¢çããªã"
+"ããã§ãã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2588,11 +2589,12 @@
"the GNU system and omit part, there is no meaningful way to say “how "
"much” you used."
msgstr ""
-"GNUã¯ã³ãã¥ããã£ã«ãã£ã¦ä¿å®ããããªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
ã§ããããã«ã¯ã(ããããã¡ã"
-"å
·ä½çãªãªã¹ããä¿å®ãã¦ãã)GNUã½ããã¦ã§ã¢ã»ããã±ã¼ã¸ãããããããã®ãã®ãå«ã¿ã"
-"人ã
ã¯å¸¸ã«ãã£ã¨å¤ãã®ããã±ã¼ã¸ãå
ãã¾ãããã®å¤æ´ã«ããããããããã¯GNUã·ã¹ãã ã®"
-"ã¾ã¾ã§ãããLinuxãå
ããã°GNU/Linuxã¨ãªãã¾ããGNUã·ã¹ãã
ã®ä¸é¨ã使ããä¸é¨ãé¤ãã"
-"ã¨ãã¦ããã©ããããã使ã£ã¦ããã¨ããæå³ã®ããæ¹æ³ã¯ãªãã§ãããã"
+"GNUã¯ã³ãã¥ããã£ã«ãã£ã¦ä¿å®ããããªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
ã§ããããã«ã¯ã"
+"(ããããã¡ãå
·ä½çãªãªã¹ããä¿å®ãã¦ãã)GNUã½ããã¦ã§ã¢ã»ããã±ã¼ã¸ãããã"
+"ãããã®ãã®ãå«ã¿ã人ã
ã¯å¸¸ã«ãã£ã¨å¤ãã®ããã±ã¼ã¸ãå ãã¾ãããã®å¤æ´ã«ã"
+"ãããããããã¯GNUã·ã¹ãã ã®ã¾ã¾ã§ãããLinuxãå
ããã°GNU/Linuxã¨ãªãã¾ãã"
+"GNUã·ã¹ãã
ã®ä¸é¨ã使ããä¸é¨ãé¤ããã¨ãã¦ããã©ããããã使ã£ã¦ããã¨ããæ"
+"å³ã®ããæ¹æ³ã¯ãªãã§ãããã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2600,9 +2602,9 @@
"GNU/Linux system. The inclusion of one important GNU package is enough to "
"justify our request for equal mention."
msgstr ""
-"ããã±ã¼ã¸ã®ã¬ãã«ãè¦ãã°ãLinuxã¯GNU/Linuxã·ã¹ãã
ã®ä¸ã§ä¸ã¤ã®éè¦ãªããã±ã¼ã¸ã§ãã"
-"ä¸ã¤ã®éè¦ãªGNUããã±ã¼ã¸ãå«ããã®ã¯ãããããã¡ã®åçã®è¨åã®è¦æ±ãæ£å½åããã®ã«å
å"
-"ã§ãããã"
+"ããã±ã¼ã¸ã®ã¬ãã«ãè¦ãã°ãLinuxã¯GNU/Linuxã·ã¹ãã
ã®ä¸ã§ä¸ã¤ã®éè¦ãªãã"
+"ã±ã¼ã¸ã§ããä¸ã¤ã®éè¦ãªGNUããã±ã¼ã¸ãå«ããã®ã¯ãããããã¡ã®åçã®è¨åã®è¦"
+"æ±ãæ£å½åããã®ã«å
åã§ãããã"
#. type: Content of: <dl><dt>
msgid ""
Index: licenses/license-list.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ja.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- licenses/license-list.ja.html 1 Jun 2015 07:11:59 -0000 1.66
+++ licenses/license-list.ja.html 1 Jul 2015 03:58:25 -0000 1.67
@@ -418,7 +418,7 @@
href="http://directory.fsf.org/wiki/License:Historical_Permission_Notice_and_Disclaimer">æ´å²çãªè¨±å¯åç¥ã¨æãæ¸ã</a>
<span class="anchor-reference-id"> (<a href="#HPND">#HPND</a>)</span></dt>
<dd>
-<p>ãã®ã©ã¤ã»ã³ã¹ã¯èªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§GPLã¨ä¸¡ç«ãã¾ããããã¯ã<a
href="#Python1.6a2">Python
+<p>ãã®ã©ã¤ã»ã³ã¹ã¯ãããå¯å®¹ãªå¼±ãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§GPLã¨ä¸¡ç«ãã¾ããããã¯ã<a
href="#Python1.6a2">Python
1.6a2ã¨ããããå¤ããã¼ã¸ã§ã³</a>ã®ã©ã¤ã»ã³ã¹ã¨ä¼¼ã¦ãã¾ãã</p></dd>
@@ -652,7 +652,7 @@
<dt><a id="WTFPL" href="http://sam.zoy.org/wtfpl/COPYING"> WTFPL
ãã¼ã¸ã§ã³2</a>
<span class="anchor-reference-id">(<a href="#WTFPL">#WTFPL</a>)</span></dt>
<dd>
-<p>ããã¯ãããå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ãGNU
GPLã¨ä¸¡ç«ãã¾ãã</p>
+<p>ããã¯ããããå¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ãGNU
GPLã¨ä¸¡ç«ãã¾ãã</p>
<p>ããããã¡ã¯ãã®ã©ã¤ã»ã³ã¹ãæ¨å¥¨ãã¾ããããããå¯å®¹ãªã©ã¤ã»ã³ã¹ãå°ããªããã°ã©ã
ã®ããã«ä½¿ãããå ´åãããããã¡ã¯<a
href="#X11License">X11ã©ã¤ã»ã³ã¹</a>ãæ¨å¥¨ãã¾ãããã大ããªããã°ã©ã
ã¯é常ã¯ã³ãã¼ã¬ããã¨ãã¹ãã§ãããããããããå¯å®¹ãªã©ã¤ã»ã³ã¹ã使ããã¨ã«ãã
ããã®ãªãã°ãããããã¡ã¯Apache
@@ -805,7 +805,7 @@
å
±ééçºããã³é
å¸ã©ã¤ã»ã³ã¹ (CDDL)ããã¼ã¸ã§ã³1.0</a>
<span class="anchor-reference-id"> (<a
href="#CDDL">#CDDL</a>)</span></dt>
<dd>
-<p>ããã¯èªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ããMozilla
ãããªãã¯ã»ã©ã¤ã»ã³ã¹ã®ãªãã®ãã®ã¨åæ§ãªã¹ã³ã¼ãã®ã³ãã¼ã¬ãããããããããã<a
+<p>ããã¯èªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ããããã¯å¼±ããã¡ã¤ã«æ¯ã®ã³ãã¼ã¬ãã(ãã¼ã¸ã§ã³1ã®Mozillaãããªãã¯ã»ã©ã¤ã»ã³ã¹ã¨åæ§)ãããããããã<a
href="/copyleft/gpl.html">GNU
GPL</a>ã¨ã¯ä¸¡ç«ãã¾ãããããã¯ãGPLã®åã¶ã¢ã¸ã¥ã¼ã«ã¨CDDLã®åã¶ã¢ã¸ã¥ã¼ã«ã¯åæ³çã«ä¸ç·ã«ãªã³ã¯ãããã¨ãã§ããªããã¨ãæå³ãã¾ãããã®ãããCDDLã¯ä½¿ããªãããå¼·ããå§ããã¾ãã</p>
@@ -1598,6 +1598,17 @@
Content
License”ã“OPL”ã¨çç¥ãã¦è¡¨è¨ãã¾ãæ
£ç¿ãããããäºã¤ã®æ··åãå¼ãèµ·ããã¦ãã¾ãã¾ãã両è
ã®éããæ確ã«ãããããã©ã¡ãã®ã©ã¤ã»ã³ã¹ã«å¯¾ãã¦ã“OPL”ã¨ããç¥èªãé¿ããã»ããè¯ãã§ããããããªããã©ã¡ãã®ã©ã¤ã»ã³ã¹ã«é¢ãã¦è¨åãã¦ããã®ã人ã
ã«ç¢ºå®ã«ç解ãã¦ãããããã«ããããã®ã©ã¤ã»ã³ã¹ã®å称ãçç¥ããã«å
¨é¨æ¸ãã ãã®ä¾¡å¤ã¯ããã¾ãã</p></dd>
+<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>
+
+<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>
+
</dl>
<!-- end class="red" -->
@@ -1846,7 +1857,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/06/01 07:11:59 $
+$Date: 2015/07/01 03:58:25 $
<!-- timestamp end -->
</p>
Index: licenses/licenses.ja.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ja.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- licenses/licenses.ja.html 13 Mar 2015 02:57:17 -0000 1.40
+++ licenses/licenses.ja.html 1 Jul 2015 03:58:26 -0000 1.41
@@ -31,6 +31,12 @@
<p>ã¾ãã<a
href="/philosophy/bsd.html">BSDã®ã©ã¤ã»ã³ã¹ã®åé¡</a>ãè«ãããã¼ã¸ãããã¾ãã</p>
+<h3>ã©ã¤ã»ã³ã¹ã®è©ä¾¡</h3>
+
+<p>ã©ã¤ã»ã³ã¹ã«ééãã¦ãããã<a
+href="/licenses/license-list.html">ã©ã¤ã»ã³ã¹ä¸è¦§</a>ã«ãªãå
´åãèªç±ãªã©ã¤ã»ã³ã¹ãã©ããè©ä¾¡ãããããã¡ã«åãåãããããã¨ãã§ãã¾ããã©ã¤ã»ã³ã¹ã®ã³ãã¼ã(ãããã¿ã¤ããURLã¨ã¨ãã«)<a
+href="mailto:address@hidden">address@hidden</a>ã¾ã§ã¡ã¼ã«ãã¦ãã
ãããããããã¡ã®ã¹ã¿ããã¨å½¹å¡ä¼ã®ã©ã¤ã»ã³ã·ã³ã°ã®å°é家ãã¬ãã¥ã¼ãã¾ããã©ã¤ã»ã³ã¹ã«æ®éã§ãªãæ¡ä»¶ããã£ãããç念çã«é£ããåé¡ãããå
´åãããã¾ãããããã°ãã決å®ã§ãããã¨ã¯ç´æã§ãã¾ããã</p>
+
<h3>ããããã¡ã®ã½ããã¦ã§ã¢ã»ã©ã¤ã»ã³ã¹ã®å
±éã®ãªã½ã¼ã¹</h3>
<p>ããããã¡ã®ãã¾ãã¾ãªã©ã¤ã»ã³ã¹ãç解ãç¨ãããã¨ãå©ããããã«ãããããã®ãªã½ã¼ã¹ãããã¾ã:</p>
@@ -322,7 +328,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
@@ -339,8 +345,8 @@
<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">
@@ -351,7 +357,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/03/13 02:57:17 $
+$Date: 2015/07/01 03:58:26 $
<!-- timestamp end -->
</p>
Index: licenses/po/license-list.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ja-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- licenses/po/license-list.ja-en.html 1 Jun 2015 07:12:01 -0000 1.23
+++ licenses/po/license-list.ja-en.html 1 Jul 2015 03:58:26 -0000 1.24
@@ -561,7 +561,7 @@
<span class="anchor-reference-id">
(<a href="#HPND">#HPND</a>)</span></dt>
<dd>
-<p>This is a free software license and is GPL compatible. It is similar to the
license of <a href="#Python1.6a2">Python 1.6a2 and earlier
versions</a>.</p></dd>
+<p>This is a lax, permissive, and weak free software license that is
compatible with the GPL. It is similar to the license of <a
href="#Python1.6a2">Python 1.6a2 and earlier versions</a>.</p></dd>
<dt><a id="iMatix" href="http://directory.fsf.org/wiki?title=License:SFL">
@@ -914,7 +914,7 @@
WTFPL, Version 2</a>
<span class="anchor-reference-id">(<a href="#WTFPL">#WTFPL</a>)</span></dt>
<dd>
-<p>This is lax permissive non-copyleft free software license,
+<p>This is a lax permissive non-copyleft free software license,
compatible with the GNU GPL.</p>
<p>We do not recommend this license. If you want a lax permissive
@@ -1111,11 +1111,12 @@
Common Development and Distribution License (CDDL), version 1.0</a>
<span class="anchor-reference-id"> (<a href="#CDDL">#CDDL</a>)</span></dt>
<dd>
-<p>This is a free software license. It has a copyleft with a scope that's
-similar to the one in the Mozilla Public License, which makes it
-incompatible with the <a href="/licenses/gpl.html">GNU GPL</a>. This means
-a module covered by the GPL and a module covered by the CDDL cannot legally
-be linked together. We urge you not to use the CDDL for this reason.</p>
+<p>This is a free software license. It has a weak per-file copyleft
+(like version 1 of the Mozilla Public License) which makes it
+incompatible with the <a href="/licenses/gpl.html">GNU GPL</a>. This
+means a module covered by the GPL and a module covered by the CDDL
+cannot legally be linked together. We urge you not to use the CDDL
+for this reason.</p>
<p>Also unfortunate in the CDDL is its use of the term “<a
href="/philosophy/not-ipr.html">intellectual
@@ -2254,6 +2255,21 @@
spelling their names in full to make sure people understand what you
say.</p></dd>
+<dt><a id="CC-BY-NC" href="?">Creative Commons Nocommercial, any version</a>
+ <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>
+
+<dt><a id="CC-BY-ND" href="?">Creative Commons Noderivatives, any version</a>
+ <span class="anchor-reference-id">
+ (<a href="#CC-BY-ND">#CC-BY-ND</a>)</span></dt>
+<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>
+
</dl> <!-- end class="red" -->
<div class="big-section">
@@ -2571,7 +2587,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/06/01 07:12:01 $
+$Date: 2015/07/01 03:58:26 $
<!-- 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.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- licenses/po/license-list.ja.po 1 Jul 2015 03:42:56 -0000 1.98
+++ licenses/po/license-list.ja.po 1 Jul 2015 03:58:26 -0000 1.99
@@ -960,9 +960,9 @@
"with the GPL. It is similar to the license of <a href="
"\"#Python1.6a2\">Python 1.6a2 and earlier versions</a>."
msgstr ""
-"ãã®ã©ã¤ã»ã³ã¹ã¯ãããå¯å®¹ãªå¼±ãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§GPLã¨ä¸¡ç«ãã¾ããããã¯ã<a
href="
-"\"#Python1.6a2\">Python
1.6a2ã¨ããããå¤ããã¼ã¸ã§ã³</a>ã®ã©ã¤ã»ã³ã¹ã¨ä¼¼ã¦ã"
-"ã¾ãã"
+"ãã®ã©ã¤ã»ã³ã¹ã¯ãããå¯å®¹ãªå¼±ãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§GPLã¨ä¸¡ç«ãã¾ãã"
+"ããã¯ã<a href=\"#Python1.6a2\">Python
1.6a2ã¨ããããå¤ããã¼ã¸ã§ã³</a>ã®ã©"
+"ã¤ã»ã³ã¹ã¨ä¼¼ã¦ãã¾ãã"
#. type: Content of: <dl><dt>
msgid ""
@@ -2037,12 +2037,11 @@
"by the GPL and a module covered by the CDDL cannot legally be linked "
"together. We urge you not to use the CDDL for this reason."
msgstr ""
-"ããã¯èªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ããããã¯å¼±ããã¡ã¤ã«æ¯ã®ã³ãã¼ã¬ãã"
-"(ãã¼ã¸ã§ã³1ã®Mozillaãããªãã¯ã»ã©ã¤ã»ã³ã¹ã¨åæ§)ãããã"
-"ãããã<a href=\"/copyleft/gpl."
-"html\">GNU
GPL</a>ã¨ã¯ä¸¡ç«ãã¾ãããããã¯ãGPLã®åã¶ã¢ã¸ã¥ã¼ã«ã¨CDDLã®åã¶ã¢"
-"ã¸ã¥ã¼ã«ã¯åæ³çã«ä¸ç·ã«ãªã³ã¯ãããã¨ãã§ããªããã¨ãæå³ãã¾ãããã®ããã"
-"CDDLã¯ä½¿ããªãããå¼·ããå§ããã¾ãã"
+"ããã¯èªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã§ããããã¯å¼±ããã¡ã¤ã«æ¯ã®ã³ãã¼ã¬ãã(ãã¼"
+"ã¸ã§ã³1ã®Mozillaãããªãã¯ã»ã©ã¤ã»ã³ã¹ã¨åæ§)ãããããããã<a
href=\"/"
+"copyleft/gpl.html\">GNU
GPL</a>ã¨ã¯ä¸¡ç«ãã¾ãããããã¯ãGPLã®åã¶ã¢ã¸ã¥ã¼ã«"
+"ã¨CDDLã®åã¶ã¢ã¸ã¥ã¼ã«ã¯åæ³çã«ä¸ç·ã«ãªã³ã¯ãããã¨ãã§ããªããã¨ãæå³ãã¾"
+"ãããã®ãããCDDLã¯ä½¿ããªãããå¼·ããå§ããã¾ãã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4369,9 +4368,9 @@
"<span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-NC\">#CC-BY-NC</a>)</"
"span>"
msgstr ""
-"<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>"
+"<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>"
#. type: Content of: <dl><dt>
msgid ""
@@ -4379,9 +4378,9 @@
"a> <span class=\"anchor-reference-id\"> (<a href=\"#CC-BY-ND\">#CC-BY-ND</a>)"
"</span>"
msgstr ""
-"<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>"
+"<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>"
#. type: Content of: <dl><dd><p>
msgid ""
Index: licenses/po/licenses.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ja-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- licenses/po/licenses.ja-en.html 13 Mar 2015 02:57:17 -0000 1.27
+++ licenses/po/licenses.ja-en.html 1 Jul 2015 03:58:26 -0000 1.28
@@ -38,6 +38,18 @@
<p>We also have a page that discusses <a href="/philosophy/bsd.html">the BSD
License Problem</a>.</p>
+<h3>Evaluating Licenses</h3>
+
+<p>If you come across a license not mentioned in our
+<a href="/licenses/license-list.html">license list</a>, you can ask us
+to evaluate whether it is a free license. Please email a copy of the
+license (and the URL where you found it)
+to <a href="mailto:address@hidden">address@hidden</a>. Our
+licensing experts in the staff and the board of directors will review
+it. If the license has some unusual conditions, they may pose
+difficult philosophical problems, so we can't promise to decide
+quickly.</p>
+
<h3>Common Resources for our Software Licenses</h3>
<p>We have a number of resources to help people understand and use our
@@ -432,7 +444,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
@@ -450,14 +462,14 @@
<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: 2015/03/13 02:57:17 $
+$Date: 2015/07/01 03:58:26 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/licenses.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ja.po,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- licenses/po/licenses.ja.po 1 Jul 2015 03:42:56 -0000 1.48
+++ licenses/po/licenses.ja.po 1 Jul 2015 03:58:26 -0000 1.49
@@ -97,12 +97,13 @@
"review it. If the license has some unusual conditions, they may pose "
"difficult philosophical problems, so we can't promise to decide quickly."
msgstr ""
-"ã©ã¤ã»ã³ã¹ã«ééãã¦ãããã<a
href=\"/licenses/license-list.html\">ã©ã¤ã»ã³ã¹ä¸è¦§"
-"</a>ã«ãªãå
´åãèªç±ãªã©ã¤ã»ã³ã¹ãã©ããè©ä¾¡ãããããã¡ã«åãåãããããã¨ãã§ãã¾ãã"
-"ã©ã¤ã»ã³ã¹ã®ã³ãã¼ã(ãããã¿ã¤ããURLã¨ã¨ãã«)<a
href=\"mailto:address@hidden">address@hidden</a>ã¾ã§ã¡ã¼ã«ãã¦ãã
ããã"
-"ããããã¡ã®ã¹ã¿ããã¨å½¹å¡ä¼ã®ã©ã¤ã»ã³ã·ã³ã°ã®å°é家ãã¬ãã¥ã¼ãã¾ãã"
-"ã©ã¤ã»ã³ã¹ã«æ®éã§ãªãæ¡ä»¶ããã£ãããç念çã«é£ããåé¡ãããå
´åãããã¾ãããã"
-"ãã°ãã決å®ã§ãããã¨ã¯ç´æã§ãã¾ããã"
+"ã©ã¤ã»ã³ã¹ã«ééãã¦ãããã<a
href=\"/licenses/license-list.html\">ã©ã¤ã»ã³"
+"ã¹ä¸è¦§</a>ã«ãªãå
´åãèªç±ãªã©ã¤ã»ã³ã¹ãã©ããè©ä¾¡ãããããã¡ã«åãåããã"
+"ããã¨ãã§ãã¾ããã©ã¤ã»ã³ã¹ã®ã³ãã¼ã(ãããã¿ã¤ããURLã¨ã¨ãã«)<a
href="
+"\"mailto:address@hidden">address@hidden</a>ã¾ã§ã¡ã¼ã«ãã¦ãã
ãããã"
+"ãããã¡ã®ã¹ã¿ããã¨å½¹å¡ä¼ã®ã©ã¤ã»ã³ã·ã³ã°ã®å°é家ãã¬ãã¥ã¼ãã¾ããã©ã¤ã»ã³"
+"ã¹ã«æ®éã§ãªãæ¡ä»¶ããã£ãããç念çã«é£ããåé¡ãããå
´åãããã¾ããããã"
+"ã°ãã決å®ã§ãããã¨ã¯ç´æã§ãã¾ããã"
#. type: Content of: <h3>
msgid "Common Resources for our Software Licenses"
Index: server/sitemap.ja.html
===================================================================
RCS file: /web/www/www/server/sitemap.ja.html,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -b -r1.224 -r1.225
--- server/sitemap.ja.html 29 Jun 2015 17:02:44 -0000 1.224
+++ server/sitemap.ja.html 1 Jul 2015 03:58:26 -0000 1.225
@@ -1655,7 +1655,7 @@
<dd>ãããã©ã¤ã¨ã¿ãªã®å±éºæ§</dd>
<dt><a
href="/proprietary/proprietary-interference.html">proprietary-interference.html</a></dt>
- <dd>Proprietary Interference</dd>
+ <dd>ãããã©ã¤ã¨ã¿ãªã®å¹²æ¸</dd>
<dt><a
href="/proprietary/proprietary-jails.html">proprietary-jails.html</a></dt>
<dd>ãããã©ã¤ã¨ã¿ãªã®ç¢ç</dd>
<dt><a
@@ -1946,7 +1946,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2015/06/29 17:02:44 $
+$Date: 2015/07/01 03:58:26 $
<!-- timestamp end -->
</p>
Index: server/po/sitemap.ja-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.ja-en.html,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/po/sitemap.ja-en.html 26 May 2015 08:29:59 -0000 1.93
+++ server/po/sitemap.ja-en.html 1 Jul 2015 03:58:27 -0000 1.94
@@ -1596,6 +1596,8 @@
<dd>Proprietary DRM</dd>
<dt><a
href="/proprietary/proprietary-insecurity.html">proprietary-insecurity.html</a></dt>
<dd>Proprietary Insecurity</dd>
+ <dt><a
href="/proprietary/proprietary-interference.html">proprietary-interference.html</a></dt>
+ <dd>Proprietary Interference</dd>
<dt><a
href="/proprietary/proprietary-jails.html">proprietary-jails.html</a></dt>
<dd>Proprietary Jails</dd>
<dt><a
href="/proprietary/proprietary-sabotage.html">proprietary-sabotage.html</a></dt>
@@ -1882,7 +1884,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/26 08:29:59 $
+$Date: 2015/07/01 03:58:27 $
<!-- timestamp end -->
</p>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www gnu/gnu-linux-faq.ja.html gnu/po/gnu-linux-...,
GNUN <=