[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/gnu thegnuproject.ja.html po/thegnuproject....
From: |
GNUN |
Subject: |
www/gnu thegnuproject.ja.html po/thegnuproject.... |
Date: |
Fri, 15 Nov 2013 05:28:26 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/11/15 05:28:25
Modified files:
gnu : thegnuproject.ja.html
gnu/po : thegnuproject.ja-en.html thegnuproject.ja.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.ja.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.ja-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.ja.po?cvsroot=www&r1=1.24&r2=1.25
Patches:
Index: thegnuproject.ja.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.ja.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- thegnuproject.ja.html 31 Aug 2013 20:10:31 -0000 1.36
+++ thegnuproject.ja.html 15 Nov 2013 05:28:25 -0000 1.37
@@ -65,7 +65,10 @@
ãããã®åææ¡ä»¶ãæå¦ãã¦ãããããã®åé¡ãå©ç¨è
ã第ä¸ã«èãã¦æ®éã®å¸¸èçãªéå¾³ã«ç
§ããåããã¦å¤æãããªãã°ãå
¨ãå¥ã®çµè«ãå°ãåºããã¾ããã³ã³ãã¥ã¼ã¿ã®å©ç¨è
ã¯èªåã®ãã¼ãºã«åããã¦ããã°ã©ã
ãå¤æ´ããã½ããã¦ã§ã¢ãå
±æããèªç±ããªããã°ãªãã¾ããããªããªããä»äººã®æå©ãããããã¨ã¯ç¤¾ä¼ã®åºæ¬ãªã®ã§ãããã</p>
<p>
ãã®çµè«ãè£ä»ããè«æ¨ã«ã¤ãã¦ååã«è¿°ã¹ãä½å°ã¯ããã«ã¯ããã¾ããã詳ããã¯ããã¡ãã®ã¦ã§ããã¼ã¸<a
-href="/philosophy/why-free.html">http://www.gnu.org/philosophy/why-free.html</a>ãåç
§ãã¦ãã ããã</p>
+href="/philosophy/why-free.html">http://www.gnu.org/philosophy/why-free.html</a>ã¨<a
+href="/philosophy/free-software-even-more-important.html">
+http://www.gnu.org/philosophy/free-software-even-more-important.html</a>ãåç
§ãã¦ãã ããã
+</p>
<h3>å·å³ãªãéå¾³ã®é¸æ</h3>
<p>
@@ -334,9 +337,12 @@
Hurdã¯ã¾ã
æ¬çªç°å¢ã§ã®å©ç¨ã«ã¯é©ãã¦ãã¾ããããã£ããããããªããã©ããããããã¾ãããã±ã¼ãããªãã£ã»ãã¼ã¹ã®ãã¶ã¤ã³ãè¨è¨ã®æè»æ§ããç´æ¥ã«åé¡ãå¼ãèµ·ããã¦ãã¾ããããã¦ã解æ³ããããã©ããæããã§ã¯ããã¾ããã</p>
<p>
-幸éãªãã¨ã«ãå¥ã®ã«ã¼ãã«ã使ããããã«ãªãã¾ããã1991å¹´ã«ãªã¼ãã¹ã»ãã¼ãã«ãºã¯Unixäºæã®ã«ã¼ãã«ãéçºãããããLinuxã¨åä»ãã¾ããã1992å¹´ã«ãå½¼ã¯Linuxãèªç±ã½ããã¦ã§ã¢ã¨ãã¾ãããLinuxã¨ã¾ã
æªå®æã ã£ãGNUã¨ã®çµã¿åããã§å®å
¨ã«èªç±ãªãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
ãèªçããã®ã§ãã(ãã®çµã¿åããã®ä½æ¥ã¯ããã¡ããããèªä½ã大å¤ãªãã®ã§ããã)ä»æ¥ã§ã¯Linuxã®ãããã§GNUã·ã¹ãã
ã®ä¸ã¤ã®çãå®éã«èµ°ããããã¨ãåºæ¥ãã®ã§ãã</p>
+幸éãªãã¨ã«ãå¥ã®ã«ã¼ãã«ã使ããããã«ãªãã¾ããã1991å¹´ã«ãªã¼ãã¹ã»ãã¼ãã«ãºã¯Unixäºæã®ã«ã¼ãã«ãéçºãããããLinuxã¨åä»ãã¾ãããå½åã¯ãããã©ã¤ã¨ã¿ãªã§ãããã1992å¹´ã«ãå½¼ã¯Linuxãèªç±ã½ããã¦ã§ã¢ã¨ãã¾ãããLinuxã¨ã¾ã
æªå®æã ã£ãGNUã¨ã®çµã¿åããã§å®å
¨ã«èªç±ãªãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
ãèªçããã®ã§ãã(ãã®çµã¿åããã®ä½æ¥ã¯ããã¡ããããèªä½ã大å¤ãªãã®ã§ããã)
+ä»æ¥ãGNUã·ã¹ãã
ã®ä¸ã¤ã®çãå®éã«èµ°ããããã¨ãåºæ¥ãã®ã¯Linuxã®ãããã§ãã</p>
<p>
-ããããã¡ã¯ãã®ã·ã¹ãã
ã®çããGNU/Linuxã¨å¼ã³ãGNUã·ã¹ãã
ã¨ã«ã¼ãã«ã§ããLinuxã®çµã¿åããã§ããåæã表ç¾ãã¾ãã</p>
+ããããã¡ã¯ãã®ã·ã¹ãã ã®çã<a
+href="/gnu/linux-and-gnu.html">GNU/Linux</a>ã¨å¼ã³ããã®æ§æããã«ã¼ãã«ã¨ãã¦ã®Linuxã¨GNUã·ã¹ãã
ã®çµã¿åããã¨ãã¦è¡¨ç¾ãã¾ããå
¨ä½ã®ã·ã¹ãã
ã“Linux”ã¨å¼ã¶æ
£ç¿ã«ã¯é¥ããªãã§ãã
ãããããã¯ãããããã¡ã®ä»äºãå¥ã®èª°ãã«å±ãããã®ãã¨æå³ãã¦ãã¾ãã¾ããããã©ãããããããã¡ã«<a
+href="/gnu/gnu-linux-faq.html">åçã®è¨å</a>ããã¦ãã ããã</p>
<h3>ããããã®ææ¦</h3>
<p>
@@ -509,7 +515,7 @@
<p><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2013/08/31 20:10:31 $
+$Date: 2013/11/15 05:28:25 $
<!-- timestamp end -->
</p>
Index: po/thegnuproject.ja-en.html
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.ja-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/thegnuproject.ja-en.html 11 Jul 2013 05:59:27 -0000 1.26
+++ po/thegnuproject.ja-en.html 15 Nov 2013 05:28:25 -0000 1.27
@@ -124,9 +124,12 @@
software, because helping other people is the basis of society.</p>
<p>
There is no room here for an extensive statement of the reasoning
-behind this conclusion, so I refer the reader to the web page,
+behind this conclusion, so I refer the reader to the web pages
<a href="/philosophy/why-free.html">
-http://www.gnu.org/philosophy/why-free.html</a>.</p>
+http://www.gnu.org/philosophy/why-free.html</a> and
+<a href="/philosophy/free-software-even-more-important.html">
+http://www.gnu.org/philosophy/free-software-even-more-important.html</a>
+</p>
<h3>A stark moral choice</h3>
<p>
@@ -716,16 +719,21 @@
clear whether solutions exist.</p>
<p>
-Fortunately, another
-kernel is available. In 1991, Linus Torvalds developed a
-Unix-compatible kernel and called it Linux. In 1992, he made Linux
-free software; combining Linux with the not-quite-complete GNU system
-resulted in a complete free operating system. (Combining them was a
-substantial job in itself, of course.) It is due to Linux that we can
-actually run a version of the GNU system today.</p>
-<p>
-We call this system version GNU/Linux, to express its composition as a
-combination of the GNU system with Linux as the kernel.</p>
+Fortunately, another kernel is available. In 1991, Linus Torvalds
+developed a Unix-compatible kernel and called it Linux. It was
+proprietary at first, but in 1992, he made it free software; combining
+Linux with the not-quite-complete GNU system resulted in a complete
+free operating system. (Combining them was a substantial job in
+itself, of course.) It is due to Linux that we can actually run a
+version of the GNU system today.</p>
+<p>
+We call this system version <a href="/gnu/linux-and-gnu.html">
+GNU/Linux</a>, to express its composition as a combination of the GNU
+system with Linux as the kernel. Please don't fall into the practice
+of calling the whole system “Linux”, since that means
+attributing our work to someone else.
+Please <a href="/gnu/gnu-linux-faq.html"> give us equal
+mention</a>.</p>
<h3>Challenges in our future</h3>
<p>
@@ -1041,7 +1049,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/07/11 05:59:27 $
+$Date: 2013/11/15 05:28:25 $
<!-- timestamp end -->
</p>
</div>
Index: po/thegnuproject.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.ja.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/thegnuproject.ja.po 15 Nov 2013 05:19:55 -0000 1.24
+++ po/thegnuproject.ja.po 15 Nov 2013 05:28:25 -0000 1.25
@@ -286,9 +286,9 @@
msgstr ""
"ãã®çµè«ãè£ä»ããè«æ¨ã«ã¤ãã¦ååã«è¿°ã¹ãä½å°ã¯ããã«ã¯ããã¾ããã詳ãã"
"ã¯ããã¡ãã®ã¦ã§ããã¼ã¸<a
href=\"/philosophy/why-free.html\">http://www.gnu."
-"org/philosophy/why-free.html</a>ã¨<a
href=\"/philosophy/free-software-even-more-important.html\"> http://"
-"www.gnu.org/philosophy/free-software-even-more-important.html</a>"
-"ãåç
§ãã¦ãã ããã"
+"org/philosophy/why-free.html</a>ã¨<a href=\"/philosophy/free-software-even-"
+"more-important.html\"> http://www.gnu.org/philosophy/free-software-even-more-"
+"important.html</a>ãåç
§ãã¦ãã ããã"
#. type: Content of: <h3>
msgid "A stark moral choice"
@@ -1563,12 +1563,11 @@
"Linux that we can actually run a version of the GNU system today."
msgstr ""
"幸éãªãã¨ã«ãå¥ã®ã«ã¼ãã«ã使ããããã«ãªãã¾ããã1991å¹´ã«ãªã¼ãã¹ã»ãã¼ã"
-"ã«ãºã¯Unixäºæã®ã«ã¼ãã«ãéçºãããããLinuxã¨åä»ãã¾ãããå½åã¯ãããã©ã¤ã¨ã¿ãª"
-"ã§ãããã1992å¹´ã«ãå½¼ã¯Linuxãèªç±ã½ããã¦ã§ã¢ã¨ãã¾ããã"
-"Linuxã¨ã¾ã æªå®æã ã£ãGNUã¨ã®çµã¿åããã§"
-"å®å
¨ã«èªç±ãªãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
ãèªçããã®ã§ãã(ãã®çµã¿åããã®ä½æ¥"
-"ã¯ããã¡ããããèªä½ã大å¤ãªãã®ã§ããã)
ä»æ¥ãGNUã·ã¹ãã ã®"
-"ä¸ã¤ã®çãå®éã«èµ°ããããã¨ãåºæ¥ãã®ã¯Linuxã®ãããã§ãã"
+"ã«ãºã¯Unixäºæã®ã«ã¼ãã«ãéçºãããããLinuxã¨åä»ãã¾ãããå½åã¯ãããã©ã¤"
+"ã¨ã¿ãªã§ãããã1992å¹´ã«ãå½¼ã¯Linuxãèªç±ã½ããã¦ã§ã¢ã¨ãã¾ãããLinuxã¨ã¾ã
"
+"æªå®æã ã£ãGNUã¨ã®çµã¿åããã§å®å
¨ã«èªç±ãªãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã ãèªçã"
+"ãã®ã§ãã(ãã®çµã¿åããã®ä½æ¥ã¯ããã¡ããããèªä½ã大å¤ãªãã®ã§ããã)
ä»"
+"æ¥ãGNUã·ã¹ãã
ã®ä¸ã¤ã®çãå®éã«èµ°ããããã¨ãåºæ¥ãã®ã¯Linuxã®ãããã§ãã"
#. type: Content of: <p>
msgid ""
@@ -1579,10 +1578,11 @@
"else. Please <a href=\"/gnu/gnu-linux-faq.html\"> give us equal mention</a>."
msgstr ""
"ããããã¡ã¯ãã®ã·ã¹ãã ã®çã<a
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</"
-"a>ã¨å¼ã³ããã®æ§æããã«ã¼ãã«ã¨ãã¦ã®Linuxã¨GNUã·ã¹ãã
ã®çµã¿åããã¨ãã¦è¡¨ç¾ãã¾ãã"
-"å
¨ä½ã®ã·ã¹ãã ã“Linux”ã¨å¼ã¶æ
£ç¿ã«ã¯é¥ããªãã§ãã ãããããã¯ã"
-"ããããã¡ã®ä»äºãå¥ã®èª°ãã«å±ãããã®ãã¨æå³ãã¦ãã¾ãã¾ãããã"
-"ã©ãããããããã¡ã«<a
href=\"/gnu/gnu-linux-faq.html\">åçã®è¨å</a>ããã¦ãã ããã"
+"a>ã¨å¼ã³ããã®æ§æããã«ã¼ãã«ã¨ãã¦ã®Linuxã¨GNUã·ã¹ãã
ã®çµã¿åããã¨ãã¦è¡¨"
+"ç¾ãã¾ããå
¨ä½ã®ã·ã¹ãã ã“Linux”ã¨å¼ã¶æ
£ç¿ã«ã¯é¥ããªãã§ãã ã"
+"ããããã¯ãããããã¡ã®ä»äºãå¥ã®èª°ãã«å±ãããã®ãã¨æå³ãã¦ãã¾ãã¾ãã"
+"ããã©ãããããããã¡ã«<a
href=\"/gnu/gnu-linux-faq.html\">åçã®è¨å</a>ã"
+"ãã¦ãã ããã"
#. type: Content of: <h3>
msgid "Challenges in our future"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/gnu thegnuproject.ja.html po/thegnuproject....,
GNUN <=