[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www education/edu-cases-argentina-ecen.ja.html ...
From: |
GNUN |
Subject: |
www education/edu-cases-argentina-ecen.ja.html ... |
Date: |
Mon, 28 Apr 2014 08:28:06 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/04/28 08:28:06
Modified files:
education : edu-cases-argentina-ecen.ja.html
edu-cases-india-ambedkar.ja.html
edu-contents.ja.html edu-resources.ja.html
edu-software-gcompris.ja.html
edu-software-tuxpaint.ja.html
edu-software.ja.html education.ja.html
education/po : edu-cases-argentina-ecen.ja-en.html
edu-cases-argentina-ecen.ja.po
edu-cases-india-ambedkar.ja-en.html
edu-contents.ja-en.html edu-contents.ja.po
edu-resources.ja-en.html edu-resources.ja.po
edu-software-gcompris.ja-en.html
edu-software-tuxpaint.ja-en.html
edu-software-tuxpaint.ja.po
edu-software.ja-en.html education.ja-en.html
education.ja.po
licenses : license-list.ja.html
licenses/po : license-list.ja-en.html license-list.ja.po
philosophy : proprietary.ru.html
philosophy/po : proprietary.ru-en.html proprietary.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-argentina-ecen.ja.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-india-ambedkar.ja.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-contents.ja.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-resources.ja.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-gcompris.ja.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software-tuxpaint.ja.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software.ja.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.ja.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-argentina-ecen.ja-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-argentina-ecen.ja.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-india-ambedkar.ja-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-contents.ja-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-contents.ja.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.ja-en.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-resources.ja.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software-gcompris.ja-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software-tuxpaint.ja-en.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software-tuxpaint.ja.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software.ja-en.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ja-en.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ja.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ja.html?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ja.po?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/proprietary.ru.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary.ru-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary.ru.po?cvsroot=www&r1=1.19&r2=1.20
Patches:
Index: education/edu-cases-argentina-ecen.ja.html
===================================================================
RCS file: /web/www/www/education/edu-cases-argentina-ecen.ja.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- education/edu-cases-argentina-ecen.ja.html 7 Apr 2014 15:46:57 -0000
1.23
+++ education/edu-cases-argentina-ecen.ja.html 28 Apr 2014 08:28:02 -0000
1.24
@@ -1,13 +1,13 @@
<!--#include virtual="/server/header.ja.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<!--#set var="ENGLISH_PAGE"
value="/education/edu-cases-argentina-ecen.en.html" -->
-<title>Escuela Cristiana Evangélica de Neuquén (ECEN)-
GNUããã¸ã§ã¯ã -
+<title>Escuela Cristiana Evangélica de Neuquén (ECEN)- GNUããã¸ã§ã¯ã
-
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</title>
<!--#include virtual="/education/po/edu-cases-argentina-ecen.translist" -->
@@ -32,7 +32,7 @@
<a href="/education/education.html">æè²</a> → <a
href="/education/edu-cases.html">ã±ã¼ã¹ã¹ã¿ãã£</a> → <a
href="/education/edu-cases-argentina.html">ã¢ã«ã¼ã³ãã³</a> →
Escuela
-Cristiana Evangélica de Neuquén (ECEN)</p>
+Cristiana Evangélica de Neuquén (ECEN)</p>
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" -->
@@ -42,7 +42,7 @@
<!--#include virtual="/server/top-addendum.ja.html" -->
<!--#endif -->
<!--#endif -->
-<h2>Escuela Cristiana Evangélica de Neuquén (ECEN)</h2>
+<h2>Escuela Cristiana Evangélica de Neuquén (ECEN)</h2>
<p>ãã®æ
å ±ã¯ãECENã®å°å¦æ ¡æ師 Debora Badilla Huento
ãæ稿ããå
±åã®æç²ã§ãã彼女ã®ç®èº«ã¯ãèªç±ã½ããã¦ã§ã¢ã¸ã®é¢å¿ãé«ããããã«å¦æ
¡ã«ãããå®å
¨ç§»è¡ã«ã¨ã£ã¦éè¦ãªå½¹å²ãæããã¾ããã</p>
@@ -110,10 +110,9 @@
<p>使ç¨ãã¦ããèªç±ããã°ã©ã :</p>
<ul>
- <li>OA: <a
href="http://directory.fsf.org/wiki/OpenOffice">OpenOffice.org</a></li>
+ <li>OA: <a
href="http://directory.fsf.org/wiki/LibreOffice">LibreOffice.org</a></li>
<li>ã¿ã¤ãã³ã°: <a
href="http://directory.fsf.org/wiki/KTouch">KTouch</a></li>
<li>ã°ã©ãã£ãã¯ãã¶ã¤ã³: <a
href="http://directory.fsf.org/wiki/GIMP">GIMP</a></li>
- <li>Webãã©ã¦ã¶: <a
href="http://directory.fsf.org/wiki/Firefox_2">Firefox</a></li>
<li>建ç¯ãã¶ã¤ã³: <a
href="http://directory.fsf.org/wiki/QCad_-_Community_Edition">QCad</a></li>
<li>å³è¡¨ãã¶ã¤ã³: <a
href="http://directory.fsf.org/wiki/Scribus">Scribus</a></li>
@@ -132,10 +131,9 @@
<!-- class="edu-cases" -->
<p>移è¡ä½æ¥ã«åå ãã
ãã£ããã¹ã¦ã®æ¹ã®ãã°ãããå°½åã«æè¬ãã¾ãã</p>
-<p><a href="/education/edu-cases.html">ã±ã¼ã¹ã¹ã¿ãã£ã¸æ»ã</a></p>
+<p class="back"><a
href="/education/edu-cases.html">ã±ã¼ã¹ã¹ã¿ãã£ã¸æ»ã</a></p>
-
-<div style="font-size: small;">
+<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
@@ -183,11 +181,10 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
</div>
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/04/07 15:46:57 $
+$Date: 2014/04/28 08:28:02 $
<!-- timestamp end -->
</p>
Index: education/edu-cases-india-ambedkar.ja.html
===================================================================
RCS file: /web/www/www/education/edu-cases-india-ambedkar.ja.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- education/edu-cases-india-ambedkar.ja.html 14 Mar 2014 05:35:48 -0000
1.25
+++ education/edu-cases-india-ambedkar.ja.html 28 Apr 2014 08:28:03 -0000
1.26
@@ -1,7 +1,8 @@
<!--#include virtual="/server/header.ja.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<!--#set var="ENGLISH_PAGE"
value="/education/edu-cases-india-ambedkar.en.html" -->
@@ -11,7 +12,6 @@
<!--#include virtual="/education/po/edu-cases-india-ambedkar.translist" -->
<!--#include virtual="/server/banner.ja.html" -->
<div id="education-content">
-<h2>Ambedkar Community Computing Center (AC3)</h2>
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
@@ -32,6 +32,16 @@
href="/education/edu-cases-india.html">ã¤ã³ã</a> → Ambedkar Community
Computing Center (AC3)</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" -->
+<!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.ja.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Ambedkar Community Computing Center (AC3)</h2>
+
<p>ä¸è¨ã®æ
å
±ã¯ãã»ã³ã¿ã¼ã§æ´»åãããã©ã³ãã£ã¢ã°ã«ã¼ãããå¯ãããã¾ããã</p>
<div class="edu-cases">
@@ -58,10 +68,10 @@
<h3>æ¹æ³</h3>
-<div style="width: 320px; margin: 30px 0px 30px 30px; float: right;">
+<div class="photo">
<a href="/education/misc/ambedkar.jpg">
-<img src="/education/misc/ambedkar-sm.jpg" alt="çå¾ãå°èª¬ 'The Future is
Ours'
ã®ã³ãã¼ããªãã£ã¼ãã»ã¹ãã¼ã«ãã³ã«æ渡ãã¦ããã¨ãã"/></a>
+<img src="/education/misc/ambedkar-sm.jpg" alt="çå¾ãå°èª¬ 'The Future is
Ours'
ã®ã³ãã¼ããªãã£ã¼ãã»ã¹ãã¼ã«ãã³ã«æ渡ãã¦ããã¨ãã"
/></a>
</div>
@@ -96,11 +106,10 @@
href="http://creativecommons.org/licenses/by-sa/3.0/"> Creative Commons
Attribution-Share Alike 3.0 Unported</a>ã®æ¡ä»¶ã§è¨±è«¾</p>
-<a
href="/education/edu-cases-india.html">ã¤ã³ãã«ãããä»ã®äºä¾</a>
<br />
-<a href="/education/edu-cases.html">ã±ã¼ã¹ã¹ã¿ãã£ã¸æ»ã</a>
+<p class="back"><a
href="/education/edu-cases-india.html">ã¤ã³ãã«ãããä»ã®äºä¾</a>
<br />
+<a href="/education/edu-cases.html">ã±ã¼ã¹ã¹ã¿ãã£ã¸æ»ã</a></p>
-
-<div style="font-size: small;">
+<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
@@ -148,11 +157,10 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
</div>
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/03/14 05:35:48 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
Index: education/edu-contents.ja.html
===================================================================
RCS file: /web/www/www/education/edu-contents.ja.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- education/edu-contents.ja.html 12 Apr 2014 13:52:57 -0000 1.26
+++ education/edu-contents.ja.html 28 Apr 2014 08:28:03 -0000 1.27
@@ -96,6 +96,8 @@
</ul>
<!-- end list of articles -->
+<p><a href="/education/misc/edu-misc.html">æè²ã®æ§ã
ãªãã®</a></p>
+
<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -147,7 +149,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/04/12 13:52:57 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
Index: education/edu-resources.ja.html
===================================================================
RCS file: /web/www/www/education/edu-resources.ja.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- education/edu-resources.ja.html 12 Apr 2014 13:52:59 -0000 1.24
+++ education/edu-resources.ja.html 28 Apr 2014 08:28:03 -0000 1.25
@@ -41,12 +41,12 @@
<!--#endif -->
<h2>èªç±ãªå¦ç¿ãªã½ã¼ã¹</h2>
-<div style="text-align: center; font-size: 110%; width: 300px; float: right;
-margin: 1em; background-color: #fcc76f; color: #000000; padding: 1em;">
-èªç±ãªæè²åãã²ã¼ã
ãæè²ç®çã§å©ç¨ã§ããèªç±ãªã²ã¼ã ã®æ
å
±ãæ¢ãã¦ãã¾ãã<a
-href="mailto:address@hidden"><address@hidden></a>ã¸ãé£çµ¡ãã
ããã</div>
+<blockquote class="note"><p>
+èªç±ãªæè²ã²ã¼ã ããæè²ç®çã«å©ç¨ã§ããèªç±ãªã²ã¼ã
ã®æ
å ±ãæ¢ãã¦ãã¾ãã<a
+href="mailto:address@hidden"><address@hidden></a>ã¸ãé£çµ¡ãã
ããã
+</p></blockquote>
-<h3><a
href="/education/edu-software.html">æè²åãèªç±ã½ããã¦ã§ã¢</a></h3>
+<h3>æè²åãèªç±ã½ããã¦ã§ã¢</h3>
<p><a
href="/education/edu-software.html">æè²åãèªç±ã½ããã¦ã§ã¢</a>ã®ã»ã¯ã·ã§ã³ã§ã¯ãä¸çã®æè²æ©é¢ã§èªç±ãªããã°ã©ã
ãã©ã®ããã«ã¤ãããã¦ãã¦ãã¾ãèªç±ã½ããã¦ã§ã¢ããã¹ã¦ã®ã¦ã¼ã¶ã«ä¸ããï¼ã¤ã®èªç±ãèªç±ããã°ã©ã
ã«ããã©ã®ããã«å®ç¾ããã¦ããããã«ã¤ãã¦ã®å®ä¾ãç´¹ä»ãã¾ãã</p>
@@ -159,7 +159,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/04/12 13:52:59 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
Index: education/edu-software-gcompris.ja.html
===================================================================
RCS file: /web/www/www/education/edu-software-gcompris.ja.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- education/edu-software-gcompris.ja.html 12 Apr 2014 13:53:01 -0000
1.25
+++ education/edu-software-gcompris.ja.html 28 Apr 2014 08:28:03 -0000
1.26
@@ -43,10 +43,11 @@
<h3>説æ</h3>
-<div style="width: 300px; margin: 0px 0px 0px 30px; float: right;">
+<div class="photo">
<a href="/education/misc/gcompris.jpg">
-<img src="/education/misc/gcompris-sm.jpg"
alt="ããããªãã¼ãã表示ããã GCompris
ã®ã¹ã¯ãªã¼ã³ã·ã§ãã"/></a>
+<img class="recessed" src="/education/misc/gcompris-sm.jpg"
+alt="ããããªãã¼ãã表示ããã GCompris
ã®ã¹ã¯ãªã¼ã³ã·ã§ãã"/></a>
</div>
<p>GComprisã¯ã2æã10æã¾ã§ã®åä¾ã対象ã¨ããã¯ãã¹ãã©ãããã©ã¼ã
ã®å®å
¨ãªæè²åãããã±ã¼ã¸ã½ããã§ãããGNUããã¸ã§ã¯ãã®ä¸é¨ã§ãã140以ä¸ã®æ¥½ããæ©è½ãå«ã¾ãã¦ãã¦ãå°ããªåä¾ãæåãæ°åã®èªèããã¦ã¹ããã¼ãã¼ãã®ä½¿ãæ¹ãåæ©çãªç®æ°è¨ç·´ãã¢ããã°æè¨ã®è¦æ¹ããã¯ãã«æç»ãã²ã¼ã
ã«ããè¨èã®å¦ç¿ãä»ããããªã¹ãã«ã®ç¿å¾ãæ¯æ´ãããã®ã§ããã¾ãããã°ã©ã
ã«ã¯åºæ¬çãªããã¹ãå½¢å¼ã§ææ¸ä½æãããã·ã³ãã«ãªã¯ã¼ãããå«ã¾ãã¦ãã¾ããä»ã®æ©è½ã¨ãã¦ã¯ãã¢ãã¡ã¼ã·ã§ã³ãã¼ã«ããããèªã¿èãããæ¯æ´ããç°¡åã§å¹æçãªæ段ã¨ãã¦ç¨ãããã¨ãã§ãã¾ããããã«ãããåä¾ã¨ã®ã³ãã¥ãã±ã¼ã·ã§ã³ãæ¹åããããåä¾ã®èªå·±è¡¨ç¾ãæ¯æ´ãããã¨ãã§ããã®ã§ãã</p>
@@ -112,7 +113,7 @@
href="/server/standards/README.translations.html">翻訳
README</a>ãã覧ãã ããã</p>
</div>
-<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>ãã®ãã¼ã¸ã¯<a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative Commons
@@ -127,7 +128,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/04/12 13:53:01 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
Index: education/edu-software-tuxpaint.ja.html
===================================================================
RCS file: /web/www/www/education/edu-software-tuxpaint.ja.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- education/edu-software-tuxpaint.ja.html 8 Apr 2014 07:27:27 -0000
1.29
+++ education/edu-software-tuxpaint.ja.html 28 Apr 2014 08:28:03 -0000
1.30
@@ -1,15 +1,30 @@
<!--#include virtual="/server/html5-header.ja.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
<!--#set var="ENGLISH_PAGE" value="/education/edu-software-tuxpaint.en.html"
-->
-<title>Tux Paint - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³ (FSF)</title>
+<title>Tux Paint - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</title>
<!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
+<style type="text/css" media="screen,print">
+<!--
+#content .stamp {
+ float: right;
+ width: 15em; max-width: 100%;
+ margin: 0 0 1em 0;
+}
+#content .stamp img, #content .stamp p {
+ width: 90%;
+ padding: 0 9%;
+}
+-->
+
+</style>
+
<!--#include virtual="/server/banner.ja.html" -->
<div id="education-content">
@@ -43,11 +58,12 @@
<h3>説æ</h3>
-<div style="width: 330px; margin: 30px 0px 30px 30px; float: right;">
+<div class="photo">
<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.ja.png,
/education/misc/tuxpaint-start.ja.png -->
<a href="/education/misc/tuxpaint-start.ja.png">
-<img src="/education/misc/tuxpaint-start-sm.ja.png" alt="Tux
Paintã®ã¹ã¯ãªã¼ã³ã·ã§ãã"/></a>
+<img class="recessed" src="/education/misc/tuxpaint-start-sm.ja.png"
+alt="Tux Paintã®ã¹ã¯ãªã¼ã³ã·ã§ãã"/></a>
</div>
<p>Tux Paint
@@ -66,10 +82,11 @@
<h3>誰ãã©ã®ããã«ä½¿ã£ã¦ããã</h3>
-<div style="with: 320px; margin:0px 0px 0px 30px; float: right;">
+<div class="photo">
<a href="/education/misc/tuxpaint-stamps.jpg">
-<img src="/education/misc/tuxpaint-stamps-sm.jpg" alt="ãã©ã¤ã¼ã©ã
èªã§ç¾å°ã®è±ã表示ããTux Paintã®ã¹ã¯ãªã¼ã³ã·ã§ãã"/></a>
+<img class="recessed" src="/education/misc/tuxpaint-stamps-sm.jpg"
+alt="ãã©ã¤ã¼ã©ã èªã§ç¾å°ã®è±ã表示ããTux
Paintã®ã¹ã¯ãªã¼ã³ã·ã§ãã"/></a>
</div>
<p>Tux Paintã使ç¨ãã¦ãã<a
href="http://tuxpaint.org/comments/">ãã¼ã ã¦ã¼ã¶</a>ã®ã³ã¡ã³ãã<a
@@ -81,28 +98,28 @@
ã¯å°æ°ã°ã«ã¼ãã«ãã使ãããªãè¨èªãã¯ãããé常ã«å¤ãã®è¨èªã§ä½¿ç¨ãããã¨ãã§ãã¦ãã¾ããå®éã«ããã¾ãåºåã§ä½¿ãããªãè¨èªã¸ã®ç¿»è¨³ãã¦ã¼ã¶èªèº«ã«ãã£ã¦è¡ããã¾ãããããã¦ãã®å
´åãä¸èªç±ãªã½ããã¦ã§ã¢ãéçºãããã¸ãã¹ãçæ¥ã¨ããä¼æ¥ã¯ãã¼ã±ããè¦æ¨¡ã«å¿ãã¦ããªã·ã¼ãå¤ãããã®ã§ã:
ãã¼ã±ãããå©çãçãã»ã©å¤§ããªãã®ã§ãªãå
´åãä¼æ¥ã¯ä¸è¬çã«ãããããã¼ã±ããã«æè³ãããããªããã®ãªã®ã§ãã</p>
-<div style="width: 170px; margin: 0px 0px 0px 30px; float: right;">
+<div class="stamp">
<a href="/education/misc/appooppanthaady.jpg">
<img src="/education/misc/appooppanthaady-sm.jpg"
alt="Appooppan Thaadyã®è±ã®ç»å" /></a>
-<p>å¦çããã©ã¤ã¼ã©ã èªã§Appooppan
Thaadyã®è±ã®ååãçºé³ãã¦ããé³å£°ã<a
+<p class="c">å¦çããã©ã¤ã¼ã©ã èªã§Appooppan
Thaadyã®è±ã®ååãçºé³ãã¦ããé³å£°ã<a
href="/education/misc/appooppanthady.ogg">è´ã</a></p>
</div>
-<!-- style -->
-<div style="width: 160px; margin: 0px 0px 0px 30px; float: right;">
+<!-- /stamp -->
+<div class="stamp">
<a href="/education/misc/anthoorium.jpg">
<img src="/education/misc/anthoorium-sm.jpg"
alt="Anthooriumã®è±ã®ç»å" /></a>
-<p>å¦çããã©ã¤ã¼ã©ã
èªã§Anthooriumã®è±ã®ååãçºé³ãã¦ããé³å£°ã<a
+<p class="c">å¦çããã©ã¤ã¼ã©ã
èªã§Anthooriumã®è±ã®ååãçºé³ãã¦ããé³å£°ã<a
href="/education/misc/anthoorium.ogg">è´ã</a></p>
</div>
-<!-- style -->
+<!-- /stamp -->
<p>Tux
Paintã§ã©ã®ããã«ã½ããã¦ã§ã¢ã®èªç±ãå®è·µããããã示ãè¯ãä¾ã¯ãã¤ã³ããã±ã¼ã©ã©å·ã®<a
href="/education/edu-cases-india-irimpanam.html">VHSS
Irimpanam</a>ã¨ããå¦æ
¡ã§11ã12æã®çå¾ãã¡ã«ãã£ã¦è¡ãããä½åã«ã¿ããã¨ãã§ãã¾ãããã®ä½åã¯ãçå¾ãã¡ãèªåãã¡ã§æ®å½±ããåçããã¨ã«ãããã°ã©ã
ã¸ä¸é£ã®ã¹ã¿ã³ãã追å
ãããã¨ã«ãã£ã¦è¡ããã¾ãããçå¾ãã¡ãç¾å°ã®è±ãåçã«æ®ããèªç±ãªGNU
@@ -136,8 +153,7 @@
href="http://creativecommons.org/licenses/by-sa/3.0/"> Creative Commons
Attribution-ShareAlike 3.0
Unported</a>ã®æ¡ä»¶ã§è¨±è«¾ããã¦ãã¾ãã</p>
-
-<div style="font-size: small;">
+<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
@@ -173,7 +189,7 @@
href="/server/standards/README.translations.html">翻訳
README</a>ãã覧ãã ããã</p>
</div>
-<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>ãã®ãã¼ã¸ã¯<a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative Commons
@@ -185,11 +201,10 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
</div>
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/04/08 07:27:27 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
Index: education/edu-software.ja.html
===================================================================
RCS file: /web/www/www/education/edu-software.ja.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- education/edu-software.ja.html 29 Mar 2014 19:34:47 -0000 1.24
+++ education/edu-software.ja.html 28 Apr 2014 08:28:03 -0000 1.25
@@ -1,7 +1,7 @@
<!--#include virtual="/server/header.ja.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
@@ -49,10 +49,10 @@
<h3>ãã®ã»ã¯ã·ã§ã³ã§æ¸ããã¦ãããã¨</h3>
-<div style="text-align: center; font-size: 110%; width: 300px; float: right;
-margin: 12px; background-color: #fcc76f; color: #000000; padding: 1em;">
+<blockquote class="note"><p>
èªç±ãªæè²åãã²ã¼ã
ãæè²ç®çã§å©ç¨ã§ããèªç±ãªã²ã¼ã ã®æ
å
±ãæ¢ãã¦ãã¾ãã<a
-href="mailto:address@hidden"><address@hidden></a>ã¸ãé£çµ¡ãã
ããã</div>
+href="mailto:address@hidden"><address@hidden></a>ã¸ãé£çµ¡ãã
ããã
+</p></blockquote>
<p>ãã®ãã¼ã¸ã§ã¯ãæè²åãã«å©ç¨å¯è½ãªèªç±ãªããã°ã©ã
ã®ç¶²ç¾
çãªãªã¹ããä½ããã¨ãã¦ããã®ã§ã¯ããã¾ãããããããã®ç®çã¯ãèªç±ã½ããã¦ã¨ã¢ãä¸ãã¦ãããèªç±ãæè²æ©é¢ãã©ã®ããã«ããã°å®è·µã§ããã¾ãå¹æçã«ç¨ãããã¨ãã§ãããã説æããããã«ãããã¤ãã®äºä¾ãç´¹ä»ãããã¨ã§ããè¨è¼ãããããããã®ããã°ã©ã
ã«ã¤ãã¦ãããããèªç±ãå®éã«ã©ã®ããã«ç¨ãããã¦ãããã示ãã¾ãã
</p>
@@ -77,8 +77,7 @@
<p>ãã決ã¾ã£ãç®çã®ããã«æè²æ©é¢ã§ä½¿ããã¦ãããããããã¯æè²çãªãã¼ãºãæºããããã«ã¦ã¼ã¶ã«ãã£ã¦ä¿®æ£ãªããã¯é©ç¨ãããèªç±ã½ããã¦ã§ã¢ããã°ã©ã
ããåç¥ã§ãããã<a
href="mailto:address@hidden"><address@hidden></a>ã¾ã§é»åã¡ã¼ã«ã§ãç¥ãããã
ããã</p>
-
-<div style="font-size: small;">
+<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
@@ -126,11 +125,10 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
</div>
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/03/29 19:34:47 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
Index: education/education.ja.html
===================================================================
RCS file: /web/www/www/education/education.ja.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- education/education.ja.html 29 Mar 2014 19:34:50 -0000 1.29
+++ education/education.ja.html 28 Apr 2014 08:28:03 -0000 1.30
@@ -1,7 +1,7 @@
<!--#include virtual="/server/html5-header.ja.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<!-- This file is automatically generated by GNUnited Nations! -->
@@ -10,6 +10,24 @@
<title>èªç±ã½ããã¦ã§ã¢ã¨æè² - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</title>
<!--#include virtual="/education/po/education.translist" -->
+<style type="text/css" media="screen">
+<!--
+#rms-movie { min-width: 60%; max-width: 100%; }
+
+#content #indepth {
+ text-align: left;
+ margin-top: 0;
+}
+#content #indepth ul {
+ padding: 0 1em;
+ margin-top: 0;
+}
+#content #indepth li { padding-bottom: 1em; }
+#content #indepth h3 { padding: 1em; margin: 0; }
+-->
+
+</style>
+
<!--#include virtual="/server/banner.ja.html" -->
<div id="education-content">
@@ -35,57 +53,51 @@
<!--#include virtual="/server/top-addendum.ja.html" -->
<!--#endif -->
<!--#endif -->
-<div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em;
-background-color: #fcc76f; color: #000000; padding:
0.5em;">èªç±ãªæè²åãã²ã¼ã
ãæè²ãç®çã¨ãã¦å©ç¨ã§ããèªç±ãªã²ã¼ã ã®æ
å
±ãæ¢ãã¦ãã¾ãã<a
-href="mailto:address@hidden"><address@hidden></a>ã¾ã§é£çµ¡ãã
ããã</div>
-
<div class="center">
-
<h2>èªç±ã½ããã¦ã§ã¢ã¨æè²</h2>
+</div>
-<h3>èªç±ã½ããã¦ã§ã¢ã¯æè²ã«ããã¦ä½ããªãã¹ããï¼</h3>
+<h3>èªç±ã½ããã¦ã§ã¢ã¯æè²ã«ã©ãé¢ä¿ãããï¼</h3>
-</div>
+<blockquote class="note"><p>
+èªç±ãªæè²ã²ã¼ã ããæè²ç®çã«å©ç¨ã§ããèªç±ãªã²ã¼ã
ã®æ
å ±ãæ¢ãã¦ãã¾ãã<a
+href="mailto:address@hidden"><address@hidden></a>ã¾ã§é£çµ¡ãã
ããã
+</p></blockquote>
-<p>æè²ã«ããã¦ã½ããã¦ã§ã¢ã®èªç±ãã¯ç¹ã«éè¦ãªå½¹å²ããã¯ããã¾ããããããéç¨ã®æè²æ©é¢ã¯èªç±ã½ããã¦ã§ã¢ãç¨ãã¦æè²ããã¹ãã§ãããªããªãã人éã®ç¥èãåºãããã社ä¼ã«ã¨ã£ã¦ããä¸å¡ã¨ãªãå¦çãè²ã¦ãããã¨ãã£ãæè²æ©é¢ããªãã¹ãä»»åã¯ãèªç±ã½ããã¦ã§ã¢ã«ãã£ã¦ã®ã¿å®ç¾ã§ããããã§ããèªç±ã½ããã¦ã§ã¢ã®ã½ã¼ã¹ã³ã¼ããææ³ã¯ã人éã®ç¥èã®ä¸é¨ã§ããå対ã«ããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ã¯ç§å¯çã§å¶éãããç¥èã§ãããæè²æ©é¢ã®ä»»åã¨ã¯æ£å対ã®ãã®ã§ããèªç±ã½ããã¦ã§ã¢ã¯æè²ãæ¯æ´ãã¾ããããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ã¯æè²ãå¶éãã¾ãã</p>
+<p>ã½ããã¦ã§ã¢ã®èªç±ã¯æè²ã«ããã¦åºæ¬çãªå½¹å²ããã¯ããã¾ããããããéç¨ã®æè²æ©é¢ã¯èªç±ã½ããã¦ã§ã¢ãç¨ãã¦æè²ããã¹ãã§ãããªããªãã人éã®ç¥èãåºãããã社ä¼ã«ã¨ã£ã¦ããä¸å¡ã¨ãªãå¦çãè²ã¦ãããã¨ãã£ãæè²æ©é¢ããªãã¹ãä»»åã¯ãèªç±ã½ããã¦ã§ã¢ã«ãã£ã¦ã®ã¿å®ç¾ã§ããããã§ããèªç±ã½ããã¦ã§ã¢ã®ã½ã¼ã¹ã³ã¼ããææ³ã¯ã人éã®ç¥èã®ä¸é¨ã§ããå対ã«ããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ã¯ç§å¯çã§å¶éãããç¥èã§ãããæè²æ©é¢ã®ä»»åã¨ã¯æ£å対ã®ãã®ã§ããèªç±ã½ããã¦ã§ã¢ã¯æè²ãæ¯æ´ãã¾ããããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ã¯æè²ãå¶éãã¾ãã</p>
<p>èªç±ã½ããã¦ã§ã¢ã¯ãã
ã®æè¡çãªåé¡ã§ã¯ããã¾ãããå«ççã§ãã社ä¼çã§ãããã¾ãæ¿æ²»çãªåé¡ã§ããã½ããã¦ã§ã¢ã®ã¦ã¼ã¶ãæ¬æ¥æã£ã¦ãã人権ã®åé¡ã§ããèªç±ã¨ååã¯èªç±ã½ããã¦ã§ã¢ã®æ¬è³ªçãªä¾¡å¤ã§ããGNUã·ã¹ãã
ã¯ãããã価å¤ã¨å
±æã®ååãå®ç¾ãã¾ãããªããªããå
±æã¯äººéã®é²æ©ã«ã¨ã£ã¦ã¨ã¦ãæçã ããã§ãã</p>
<p>ããã«ç¥ããããã°ã<a
href="/philosophy/free-sw.html">èªç±ã½ããã¦ã§ã¢ã®å®ç¾©</a>ã<a
href="/philosophy/shouldbefree.html">ãªãã½ããã¦ã§ã¢ã¯freeã§ããã¹ãã</a>(èªç±ã®æ)ã®è¨äºãèªãã§ãã
ããã</p>
-<div class="yui-gc">
- <div class="yui-u first">
-<h2>åºç¤</h2>
+<h3>åºç¤</h3>
+<p>GNUããã¸ã§ã¯ãã¯ãèªç±ãªãã¬ã¼ãã£ã³ã°ã·ã¹ãã
ï¼GNUãªãã¬ã¼ãã£ã³ã°ã·ã¹ãã
ããéçºããããã«ããªãã£ã¼ãã»ã¹ãã¼ã«ãã³ã«ãã£ã¦1983å¹´ã«<a
+href="/gnu/initial-announcement.html">çºè¶³</a>ãã¾ããããã®çµæãä»ã§ã¯ã
ãããèªç±ã«ã³ã³ãã¥ã¼ã¿ãå©ç¨ãããã¨ãã§ããããã«ãªãã¾ããã</p>
<p>ãã®ï¼åã®ãããªã®ä¸ã§ã<a
href="http://www.fsf.org/about/leadership/#rms">ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³</a>ãèªç±ã½ããã¦ã§ã¢ã®ååã«ã¤ãã¦è¦ç¹ã説æãããã®ååãæè²ã¨ã©ã®ããã«é¢ä¿ããã®ãã説æãã¦ãã¾ãã</p>
-<p>
+<blockquote class="note" id="indepth">
+<h3>詳細</h3>
-<!-- TRANSLATORS: please add the link to your language here in the first
- place, followed by a comma. -->
-ãã®ãããªã®é³å£°ããã¹ãã¯ã<a
-href="/education/misc/rms-education-es-translation-to-en.txt">è±èª</a>ã<a
-href="/education/misc/rms-education-es-transcription.txt">ã¹ãã¤ã³èª</a>ã<a
-href="/education/misc/edu-misc.html#transcriptions-rms-education">ãã®ä»ã®è¨èª</a>ã§èªããã¨ãã§ãã¾ãã
-</p>
+<ul>
+<li>æè²æ©é¢ãèªç±ã½ããã¦ã§ã¢ã
ããã¤ãã£ã¦æè²ããããªãã¹ã<a
+href="/education/edu-why.html">çç±</a>ã«ã¤ãã¦å¦ãã§ãã
ããã</li>
-<p>
+<li>ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³ã®è¨äºï¼<a
+href="/education/edu-schools.html">å¦æ ¡ã§èªç±ã½ããã¦ã§ã¢ã
ãã使ãã¹ãçç±</a></li>
-<!-- TRANSLATORS: please add the link to your language here in the first
- place, followed by a comma. -->
-SubRipã®åå¹ãã¡ã¤ã«ã<a
-href="/education/misc/rms-education-es-sub.en.srt">è±èª</a>ã<a
-href="/education/misc/rms-education-es-sub.es.srt">ã¹ãã¤ã³èª</a>ã<a
-href="/education/misc/edu-misc.html#subtitles-rms-education">ãã®ä»ã®è¨èª</a>ã§ãã¦ã³ãã¼ããã§ãã¾ãã
-</p>
+<li>Dr. V. Sasi Kumarã«ãã<a
+href="/education/edu-system-india.html">ã¤ã³ãã®æè²ã·ã¹ãã
</a>ã«ã¤ãã¦ã®è¨äº</li>
+</ul>
+</blockquote>
<!-- GNUN: localize URL /education/rms-education-es.ogv -->
-<video id="rms-movie" width="512" height="288" controls="controls">
+<video id="rms-movie" controls="controls">
<source
- src="/education/rms-education-es.ogv"
+ src="http://www.gnu.org/education/rms-education-es.ogv"
type='video/ogg; codecs="theora, vorbis"' />
</video>
@@ -98,27 +110,27 @@
href="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv">ãã¦ã³ãã¼ããã¦ãããªãã¿ãã</a>
(Ogg Theora (ogv) èªç±ãã©ã¼ããã)</p>
-<p>GNUããã¸ã§ã¯ãã¯ãèªç±ãªãã¬ã¼ãã£ã³ã°ã·ã¹ãã
ï¼GNUãªãã¬ã¼ãã£ã³ã°ã·ã¹ãã
ããéçºããããã«ããªãã£ã¼ãã»ã¹ãã¼ã«ãã³ã«ãã£ã¦1983å¹´ã«<a
-href="/gnu/initial-announcement.html">çºè¶³</a>ãã¾ããããã®çµæãä»ã§ã¯ã
ãããèªç±ã«ã³ã³ãã¥ã¼ã¿ãå©ç¨ãããã¨ãã§ããããã«ãªãã¾ããã</p>
-
-</div>
-<div class="yui-u">
-
-<h2 id="indepth">詳細</h2>
-
-<p>æè²æ©é¢ãèªç±ã½ããã¦ã§ã¢ã
ããã¤ãã£ã¦æè²ããããªãã¹ã<a
-href="/education/edu-why.html">çç±</a>ã«ã¤ãã¦å¦ãã§ãã
ããã</p>
+<p>
-<p>ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³ã®è¨äºï¼<a
-href="/education/edu-schools.html">å¦æ ¡ã§èªç±ã½ããã¦ã§ã¢ã
ãã使ãã¹ãçç±</a></p>
+<!-- TRANSLATORS: please add the link to your language here in the first
+ place, followed by a comma. -->
+ãã®ãããªã®é³å£°ããã¹ãã¯ã<a
+href="/education/misc/rms-education-es-translation-to-en.txt">è±èª</a>ã<a
+href="/education/misc/rms-education-es-transcription.txt">ã¹ãã¤ã³èª</a>ã<a
+href="/education/misc/edu-misc.html#transcriptions-rms-education">ãã®ä»ã®è¨èª</a>ã§èªããã¨ãã§ãã¾ãã
+</p>
-<p>Dr. V. Sasi Kumarã«ãã<a
-href="/education/edu-system-india.html">ã¤ã³ãã®æè²ã·ã¹ãã
</a>ã«ã¤ãã¦ã®è¨äº</p>
+<p>
-</div>
-</div>
+<!-- TRANSLATORS: please add the link to your language here in the first
+ place, followed by a comma. -->
+SubRipã®åå¹ãã¡ã¤ã«ã<a
+href="/education/misc/rms-education-es-sub.en.srt">è±èª</a>ã<a
+href="/education/misc/rms-education-es-sub.es.srt">ã¹ãã¤ã³èª</a>ã<a
+href="/education/misc/edu-misc.html#subtitles-rms-education">ãã®ä»ã®è¨èª</a>ã§ãã¦ã³ãã¼ããã§ãã¾ãã
+</p>
-<div style="font-size: small;">
+<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
@@ -154,7 +166,7 @@
href="/server/standards/README.translations.html">翻訳
README</a>ãã覧ãã ããã</p>
</div>
-<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>ãã®ãã¼ã¸ã¯<a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative Commons
@@ -166,11 +178,10 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
</div>
-
- <p></p><p class="unprintable"><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/03/29 19:34:50 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
Index: education/po/edu-cases-argentina-ecen.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-cases-argentina-ecen.ja-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- education/po/edu-cases-argentina-ecen.ja-en.html 14 Mar 2014 05:35:55
-0000 1.19
+++ education/po/edu-cases-argentina-ecen.ja-en.html 28 Apr 2014 08:28:03
-0000 1.20
@@ -1,14 +1,13 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Escuela Cristiana Evangélica de Neuquén (ECEN)-
-GNU Project - Free Software Foundation</title>
+<title>Escuela Cristiana Evangélica de Neuquén (ECEN) - GNU Project - Free
Software Foundation</title>
<!--#include virtual="/education/po/edu-cases-argentina-ecen.translist" -->
<!--#include virtual="/server/banner.html" -->
<div id="education-content">
-<h2>Escuela Cristiana Evangélica de Neuquén (ECEN)</h2>
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
@@ -27,7 +26,15 @@
<a href="/education/education.html">Education</a> →
<a href="/education/edu-cases.html">Case Studies</a> →
<a href="/education/edu-cases-argentina.html">Argentina</a> →
-Escuela Cristiana Evangélica de Neuquén (ECEN)</p>
+Escuela Cristiana Evangélica de Neuquén (ECEN)</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Escuela Cristiana Evangélica de Neuquén (ECEN)</h2>
<p>The following information was extracted from a report submitted to us
by ECEN Elementary Teacher Debora Badilla Huento. Her commitment played
@@ -38,9 +45,9 @@
<h3>Location</h3>
-<p>City of Neuquén, capital of the
+<p>City of Neuquén, capital of the
<a href="http://en.wikipedia.org/wiki/Neuquen_Province">
-Province of Neuquén</a>, in the Argentine Patagonia Region.</p>
+Province of Neuquén</a>, in the Argentine Patagonia Region.</p>
<h3>About</h3>
@@ -49,7 +56,7 @@
requirements.</p>
<p>In Argentina, each province develops its own educational policy. In
-the case of the province of Neuquén, teaching computer science at
+the case of the province of Neuquén, teaching computer science at
elementary schools is not obligatory. Actually, computer science is an
extracurricular subject.</p>
@@ -136,13 +143,11 @@
<ul>
<li>Office automation:
- <a href="http://directory.fsf.org/wiki/OpenOffice">OpenOffice.org</a></li>
+ <a href="http://directory.fsf.org/wiki/LibreOffice">LibreOffice</a></li>
<li>Typing:
<a href="http://directory.fsf.org/wiki/KTouch">KTouch</a></li>
<li>Graphic design:
<a href="http://directory.fsf.org/wiki/GIMP">GIMP</a></li>
- <li>Web browsers:
- <a href="http://directory.fsf.org/wiki/Firefox_2">Firefox</a></li>
<li>Architectural design:
<a
href="http://directory.fsf.org/wiki/QCad_-_Community_Edition">QCad</a></li>
<li>Graphical design:
@@ -157,7 +162,7 @@
<p>We found the migration experience quite positive and we decided to
adopt a Free Software environment for all work stations. In October 2009 the
-school sponsored the Software Freedom Day in the city of San Martín de
+school sponsored the Software Freedom Day in the city of San MartÃn de
los Andes.</p>
<p>Although it required dedication and perseverance, the process was pleasant.
@@ -169,7 +174,7 @@
<p>We would like to express our appreciation for the excellent work done to
all the people involved in the migration effort.</p>
-<p><a href="/education/edu-cases.html">Back to Case Studies</a></p>
+<p class="back"><a href="/education/edu-cases.html">Back to Case
Studies</a></p>
</div><!-- for id="content", starts in the include above -->
@@ -210,9 +215,9 @@
<!--#include virtual="/server/bottom-notes.html" -->
-<p></p><p class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/03/14 05:35:55 $
+$Date: 2014/04/28 08:28:03 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-cases-argentina-ecen.ja.po
===================================================================
RCS file: /web/www/www/education/po/edu-cases-argentina-ecen.ja.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- education/po/edu-cases-argentina-ecen.ja.po 28 Apr 2014 08:10:41 -0000
1.17
+++ education/po/edu-cases-argentina-ecen.ja.po 28 Apr 2014 08:28:03 -0000
1.18
@@ -20,8 +20,8 @@
"Escuela Cristiana Evangélica de Neuquén (ECEN) - GNU Project - Free
Software "
"Foundation"
msgstr ""
-"Escuela Cristiana Evangélica de Neuquén (ECEN)- GNUããã¸ã§ã¯"
-"ã - ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³"
+"Escuela Cristiana Evangélica de Neuquén (ECEN)- GNUããã¸ã§ã¯ã -
ããªã¼ã½ã"
+"ãã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³"
#. type: Content of: <div><ul><li>
msgid "<a href=\"/education/edu-contents.html\">Education Contents</a>"
@@ -56,8 +56,8 @@
msgstr ""
"<a href=\"/education/education.html\">æè²</a> → <a href=\"/education/"
"edu-cases.html\">ã±ã¼ã¹ã¹ã¿ãã£</a> → <a
href=\"/education/edu-cases-"
-"argentina.html\">ã¢ã«ã¼ã³ãã³</a> → Escuela Cristiana Evangélica "
-"de Neuquén (ECEN)"
+"argentina.html\">ã¢ã«ã¼ã³ãã³</a> → Escuela Cristiana Evangélica
de "
+"Neuquén (ECEN)"
#. type: Content of: <h2>
msgid "Escuela Cristiana Evangélica de Neuquén (ECEN)"
Index: education/po/edu-cases-india-ambedkar.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-cases-india-ambedkar.ja-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- education/po/edu-cases-india-ambedkar.ja-en.html 14 Mar 2014 05:35:57
-0000 1.22
+++ education/po/edu-cases-india-ambedkar.ja-en.html 28 Apr 2014 08:28:04
-0000 1.23
@@ -1,14 +1,13 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Ambedkar Community Computing Center (AC3) - GNU Project - Free Software
-Foundation</title>
+<title>Ambedkar Community Computing Center (AC3) - GNU Project - Free Software
Foundation</title>
<!--#include virtual="/education/po/edu-cases-india-ambedkar.translist" -->
<!--#include virtual="/server/banner.html" -->
<div id="education-content">
-<h2>Ambedkar Community Computing Center (AC3)</h2>
<!-- begin edu navigation bar -->
@@ -28,6 +27,14 @@
<a href="/education/edu-cases.html">Case Studies</a> →
<a href="/education/edu-cases-india.html">India</a> → Ambedkar Community
Computing Center (AC3)</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+<h2>Ambedkar Community Computing Center (AC3)</h2>
<p>The following information was submitted to us by the group of volunteers
working at the Center.</p>
@@ -65,11 +72,11 @@
<h3>How We Did It</h3>
-<div style="width: 320px; margin: 30px 0px 30px 30px; float: right;">
+<div class="photo">
<a href="/education/misc/ambedkar.jpg">
<img src="/education/misc/ambedkar-sm.jpg" alt="Image of a student handing
-a copy of the essay 'The Future is Ours' to Richard Stallman."/></a>
+a copy of the essay 'The Future is Ours' to Richard Stallman." /></a>
</div>
@@ -121,9 +128,9 @@
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
Creative Commons Attribution-Share Alike 3.0 Unported License</a>.</p>
-<a href="/education/edu-cases-india.html">More Case Studies
+<p class="back"><a href="/education/edu-cases-india.html">More Case Studies
in India</a> <br />
-<a href="/education/edu-cases.html">Back to Case Studies</a>
+<a href="/education/edu-cases.html">Back to Case Studies</a></p>
</div><!-- for id="content", starts in the include above -->
@@ -164,9 +171,9 @@
<!--#include virtual="/server/bottom-notes.html" -->
-<p></p><p class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/03/14 05:35:57 $
+$Date: 2014/04/28 08:28:04 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-contents.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-contents.ja-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- education/po/edu-contents.ja-en.html 12 Apr 2014 13:53:14 -0000
1.23
+++ education/po/edu-contents.ja-en.html 28 Apr 2014 08:28:04 -0000
1.24
@@ -88,8 +88,8 @@
<p><strong>Articles</strong></p>
<ul>
- <li><a href="/education/edu-why.html">Reasons Why educational
- institutions should use and teach exclusively Free Software</a>.</li>
+ <li><a href="/education/edu-why.html">Why Educational
+ Institutions Should Use and Teach Exclusively Free Software</a>.</li>
<li><a href="/education/edu-schools.html">Why Schools Should
Exclusively Use Free Software</a></li>
@@ -98,6 +98,9 @@
India</a>.</li>
</ul><!-- end list of articles -->
+<p><a href="/education/misc/edu-misc.html">Education Miscellaneous
+ Materials</a></p>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -139,7 +142,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:53:14 $
+$Date: 2014/04/28 08:28:04 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-contents.ja.po
===================================================================
RCS file: /web/www/www/education/po/edu-contents.ja.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- education/po/edu-contents.ja.po 28 Apr 2014 08:10:42 -0000 1.18
+++ education/po/edu-contents.ja.po 28 Apr 2014 08:28:04 -0000 1.19
@@ -165,8 +165,7 @@
msgid ""
"<a href=\"/education/misc/edu-misc.html\">Education Miscellaneous Materials</"
"a>"
-msgstr ""
-"<a href=\"/education/misc/edu-misc.html\">æè²ã®æ§ã
ãªãã®</a>"
+msgstr "<a href=\"/education/misc/edu-misc.html\">æè²ã®æ§ã
ãªãã®</a>"
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
Index: education/po/edu-resources.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-resources.ja-en.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education/po/edu-resources.ja-en.html 12 Apr 2014 13:53:17 -0000
1.21
+++ education/po/edu-resources.ja-en.html 28 Apr 2014 08:28:04 -0000
1.22
@@ -33,13 +33,13 @@
<!--#endif -->
<h2>Free Learning Resources</h2>
-<div style="text-align: center; font-size: 110%; width: 300px; float: right;
-margin: 1em; background-color: #fcc76f; color: #000000; padding: 1em;">
-We are looking for free educational games, or free games that can be used
-for educational purposes. Contact <a
-href="mailto:address@hidden"><address@hidden></a></div>
+<blockquote class="note"><p>
+We are looking for free educational games, or information about free games
+that can be used for educational purposes. Contact
+<a href="mailto:address@hidden"><address@hidden></a>.
+</p></blockquote>
-<h3><a href="/education/edu-software.html">Educational Free Software</a></h3>
+<h3>Educational Free Software</h3>
<p>In our <a href="/education/edu-software.html">Educational
Free Software</a> section we present some examples of how free programs
@@ -183,7 +183,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:53:17 $
+$Date: 2014/04/28 08:28:04 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-resources.ja.po
===================================================================
RCS file: /web/www/www/education/po/edu-resources.ja.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- education/po/edu-resources.ja.po 28 Apr 2014 08:10:42 -0000 1.15
+++ education/po/edu-resources.ja.po 28 Apr 2014 08:28:04 -0000 1.16
@@ -61,9 +61,9 @@
"that can be used for educational purposes. Contact <a href=\"mailto:"
"address@hidden"><address@hidden></a>."
msgstr ""
-"èªç±ãªæè²ã²ã¼ã ããæè²ç®çã«å©ç¨ã§ããèªç±ãªã²ã¼ã
ã®æ
å ±ãæ¢ãã¦ãã¾ãã"
-"<a href=\"mailto:address@hidden"><address@hidden></a>ã¸ãé£çµ¡ã"
-"ã ããã"
+"èªç±ãªæè²ã²ã¼ã ããæè²ç®çã«å©ç¨ã§ããèªç±ãªã²ã¼ã
ã®æ
å ±ãæ¢ãã¦ãã¾ãã<a "
+"href=\"mailto:address@hidden"><address@hidden></a>ã¸ãé£çµ¡ãã ã"
+"ãã"
#. type: Content of: <h3>
msgid "Educational Free Software"
Index: education/po/edu-software-gcompris.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-software-gcompris.ja-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- education/po/edu-software-gcompris.ja-en.html 12 Apr 2014 13:53:18
-0000 1.22
+++ education/po/edu-software-gcompris.ja-en.html 28 Apr 2014 08:28:04
-0000 1.23
@@ -27,6 +27,7 @@
<a href="/education/edu-resources.html">Educational Resources</a> →
<a href="/education/edu-software.html">Educational Free Software</a> →
GCompris</p>
+
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -34,15 +35,16 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
+
<h2>GCompris</h2>
<h3>Description</h3>
-<div style="width: 300px; margin: 0px 0px 0px 30px; float: right;">
+<div class="photo">
<a href="/education/misc/gcompris.jpg">
-<img src="/education/misc/gcompris-sm.jpg" alt="Screenshot of the GCompris
-interface showing the various boards."/></a>
+<img class="recessed" src="/education/misc/gcompris-sm.jpg"
+alt="Screenshot of the GCompris interface showing the various boards."/></a>
</div>
<p>GCompris is a cross-platform complete educational suite for children
@@ -151,7 +153,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 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
@@ -161,7 +163,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:53:18 $
+$Date: 2014/04/28 08:28:04 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-software-tuxpaint.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-software-tuxpaint.ja-en.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education/po/edu-software-tuxpaint.ja-en.html 14 Mar 2014 05:36:14
-0000 1.21
+++ education/po/edu-software-tuxpaint.ja-en.html 28 Apr 2014 08:28:04
-0000 1.22
@@ -1,13 +1,29 @@
<!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-<title>Tux Paint - GNU Project - Free Software Foundation (FSF)</title>
+<title>Tux Paint
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
+
+<style type="text/css" media="screen,print">
+<!--
+#content .stamp {
+ float: right;
+ width: 15em; max-width: 100%;
+ margin: 0 0 1em 0;
+}
+#content .stamp img, #content .stamp p {
+ width: 90%;
+ padding: 0 9%;
+}
+-->
+</style>
+
<!--#include virtual="/server/banner.html" -->
<div id="education-content">
-<h2>Tux Paint</h2>
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
@@ -27,15 +43,25 @@
<a href="/education/edu-software.html">Educational Free Software</a> →
Tux Paint</p>
+<!--GNUN: OUT-OF-DATE NOTICE-->
+<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
+<!--#if expr="$LANGUAGE_SUFFIX" -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<!--#endif -->
+<!--#endif -->
+
+<h2>Tux Paint</h2>
+
<h3>Description</h3>
-<div style="width: 330px; margin: 30px 0px 30px 30px; float: right;">
+<div class="photo">
<!-- GNUN: localize URL /education/misc/tuxpaint-start-sm.png,
/education/misc/tuxpaint-start.png -->
<a href="/education/misc/tuxpaint-start.png">
-<img src="/education/misc/tuxpaint-start-sm.png" alt="Screenshot of the Tux
-Paint interface."/></a>
+<img class="recessed" src="/education/misc/tuxpaint-start-sm.png"
+alt="Screenshot of the Tux Paint interface."/></a>
</div>
<p>Tux Paint is a cross-platform drawing program created specifically
@@ -73,11 +99,11 @@
<h3>Who's Using It and How</h3>
-<div style="with: 320px; margin:0px 0px 0px 30px; float: right;">
+<div class="photo">
<a href="/education/misc/tuxpaint-stamps.jpg">
-<img src="/education/misc/tuxpaint-stamps-sm.jpg" alt="Screenshot of
-the Tux Paint interface in Malayalam with native flowers."/></a>
+<img class="recessed" src="/education/misc/tuxpaint-stamps-sm.jpg"
+alt="Screenshot of the Tux Paint interface in Malayalam with native
flowers."/></a>
</div>
<p>Comments by <a href="http://tuxpaint.org/comments/">home users</a>
@@ -104,25 +130,25 @@
size: if the market is not large enough to ensure profit, they are
generally reluctant to invest on it.</p>
-<div style="width: 170px; margin: 0px 0px 0px 30px; float: right;">
+<div class="stamp">
<a href="/education/misc/appooppanthaady.jpg">
<img src="/education/misc/appooppanthaady-sm.jpg"
alt="Image of the Appooppan Thaady flower." /></a>
-<p><a href="/education/misc/appooppanthady.ogg">Listen</a> to a student
+<p class="c"><a href="/education/misc/appooppanthady.ogg">Listen</a> to a
student
pronounce the name of the Appooppan Thaady flower in Malayalam.</p>
-</div> <!-- style -->
+</div> <!-- /stamp -->
-<div style="width: 160px; margin: 0px 0px 0px 30px; float: right;">
+<div class="stamp">
<a href="/education/misc/anthoorium.jpg">
<img src="/education/misc/anthoorium-sm.jpg"
alt="Image of the Anthoorium flower." /></a>
-<p><a href="/education/misc/anthoorium.ogg">Listen</a> to a student
+<p class="c"><a href="/education/misc/anthoorium.ogg">Listen</a> to a student
pronounce the name of the Anthoorium flower in Malayalam.</p>
-</div> <!-- style -->
+</div> <!-- /stamp -->
<p>A good example of how software freedom can be applied in Tux Paint is
the work done by 11 and 12 years old students from the
@@ -216,7 +242,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 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
@@ -224,9 +250,9 @@
<!--#include virtual="/server/bottom-notes.html" -->
-<p></p><p class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/03/14 05:36:14 $
+$Date: 2014/04/28 08:28:04 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-software-tuxpaint.ja.po
===================================================================
RCS file: /web/www/www/education/po/edu-software-tuxpaint.ja.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education/po/edu-software-tuxpaint.ja.po 28 Apr 2014 08:10:42 -0000
1.21
+++ education/po/edu-software-tuxpaint.ja.po 28 Apr 2014 08:28:04 -0000
1.22
@@ -17,8 +17,7 @@
#. type: Content of: <title>
msgid "Tux Paint - GNU Project - Free Software Foundation"
-msgstr ""
-"Tux Paint - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³"
+msgstr "Tux Paint - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³"
#. type: Content of: <div><ul><li>
msgid "<a href=\"/education/edu-contents.html\">Education Contents</a>"
Index: education/po/edu-software.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-software.ja-en.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education/po/edu-software.ja-en.html 29 Mar 2014 19:35:01 -0000
1.21
+++ education/po/edu-software.ja-en.html 28 Apr 2014 08:28:05 -0000
1.22
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Educational Free Software
@@ -48,11 +48,11 @@
<h3>What you will find in this section</h3>
-<div style="text-align: center; font-size: 110%; width: 300px; float: right;
-margin: 12px; background-color: #fcc76f; color: #000000; padding: 1em;">
+<blockquote class="note"><p>
We are looking for free educational games, or information about free games
that can be used for educational purposes. Contact
-<a href="mailto:address@hidden"><address@hidden></a></div>
+<a href="mailto:address@hidden"><address@hidden></a>.
+</p></blockquote>
<p>These pages do not constitute an exhaustive listing of available
educational free programs. Our aim is to present some examples so as to
@@ -140,9 +140,9 @@
<!--#include virtual="/server/bottom-notes.html" -->
-<p></p><p class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/03/29 19:35:01 $
+$Date: 2014/04/28 08:28:05 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/education.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/education.ja-en.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- education/po/education.ja-en.html 29 Mar 2014 19:35:05 -0000 1.25
+++ education/po/education.ja-en.html 28 Apr 2014 08:28:05 -0000 1.26
@@ -1,11 +1,29 @@
<!--#include virtual="/server/html5-header.html" -->
-<!-- Parent-Version: 1.76 -->
+<!-- Parent-Version: 1.77 -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Free Software and Education
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/education/po/education.translist" -->
+
+<style type="text/css" media="screen">
+<!--
+#rms-movie { min-width: 60%; max-width: 100%; }
+
+#content #indepth {
+ text-align: left;
+ margin-top: 0;
+}
+#content #indepth ul {
+ padding: 0 1em;
+ margin-top: 0;
+}
+#content #indepth li { padding-bottom: 1em; }
+#content #indepth h3 { padding: 1em; margin: 0; }
+-->
+</style>
+
<!--#include virtual="/server/banner.html" -->
<div id="education-content">
@@ -22,6 +40,7 @@
<!-- end edu navigation bar -->
</div> <!-- id="education-content" -->
+
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -30,21 +49,19 @@
<!--#endif -->
<!--#endif -->
-<div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em;
-background-color: #fcc76f; color: #000000; padding: 0.5em;">We are
-looking for free educational games, or free games that can be used for
-educational purposes. Contact <a
-href="mailto:address@hidden"><address@hidden></a></div>
-
<div class="center">
-
<h2>Free Software and Education</h2>
+</div>
-<h3>What Does Free Software Have To Do With Education?</h3>
+<h3>How Does Free Software Relate to Education?</h3>
-</div>
+<blockquote class="note"><p>
+We are looking for free educational games, or information about free games
+that can be used for educational purposes. Contact
+<a href="mailto:address@hidden"><address@hidden></a>.
+</p></blockquote>
-<p>Software freedom has an especially important role in education.
+<p>Software freedom plays a fundamental role in education.
Educational institutions of all levels should use and teach Free
Software because it is the only software that allows them to accomplish
their essential missions: to disseminate human knowledge and to prepare
@@ -67,44 +84,39 @@
<a href="/philosophy/shouldbefree.html">why software should be free</a>
(as in freedom).</p>
-<div class="yui-gc">
- <div class="yui-u first">
-<h2>The Basics</h2>
+<h3>The Basics</h3>
+<p>The GNU Project was
+<a href=" /gnu/initial-announcement.html">launched</a> in 1983 by
+Richard Stallman to develop a Free Libre operating system: the GNU
+operating system. As a result, today it is possible for anyone to use a
+computer in freedom.</p>
<p>In this six-minutes video
<a href="http://www.fsf.org/about/leadership/#rms">Richard Stallman</a>
explains briefly and to the point the principles of Free Software and
how they connect to education.</p>
-<p>
-<!-- TRANSLATORS: please add the link to your language here in the first
- place, followed by a comma. -->
-
-Transcriptions of this video are available in
+<blockquote class="note" id="indepth">
+<h3>In Depth</h3>
-<a href="/education/misc/rms-education-es-translation-to-en.txt">English</a>,
-<a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and
-<a href="/education/misc/edu-misc.html#transcription-rms-education">
- other languages</a>.
-</p>
+<ul>
+<li>Learn about the <a href="/education/edu-why.html">Reasons Why</a>
+educational institutions should use and teach exclusively Free Software.</li>
-<p>
-<!-- TRANSLATORS: please add the link to your language here in the first
- place, followed by a comma. -->
+<li>An article by Richard Stallman:
+<a href="/education/edu-schools.html">Why Schools Should Exclusively Use
+Free Software</a></li>
-SubRip subtitle files are also available for download in
-<a href="/education/misc/rms-education-es-sub.en.srt">English</a>,
-<a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a>, and
-<a href="/education/misc/edu-misc.html#subtitles-rms-education">other
- languages</a>.
-</p>
+<li>An article by Dr. V. Sasi Kumar on the
+<a href="/education/edu-system-india.html">education system in India.</a></li>
+</ul>
+</blockquote>
<!-- GNUN: localize URL /education/rms-education-es.ogv -->
-
-<video id="rms-movie" width="512" height="288" controls="controls">
+<video id="rms-movie" controls="controls">
<source
- src="/education/rms-education-es.ogv"
+ src="http://www.gnu.org/education/rms-education-es.ogv"
type='video/ogg; codecs="theora, vorbis"' />
</video>
@@ -112,35 +124,34 @@
<!-- TRANSLATORS: Please replace the link to the video with subtitles in
English with a link to the video with subtitles in your language,
if it exists. -->
-
<a
href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv">
Download and watch the video</a> at a higher definition in the Ogg Theora
(ogv) free format.</p>
-<p>The GNU Project was
-<a href=" /gnu/initial-announcement.html">launched</a> in 1983 by
-Richard Stallman to develop a Free Libre operating system: the GNU
-operating system. As a result, today it is possible for anyone to use a
-computer in freedom.</p>
-
-</div>
-<div class="yui-u">
+<p>
+<!-- TRANSLATORS: please add the link to your language here in the first
+ place, followed by a comma. -->
-<h2 id="indepth">In Depth</h2>
+Transcriptions of this video are available in
-<p>Learn about the <a href="/education/edu-why.html">Reasons Why</a>
-educational institutions should use and teach exclusively Free Software.</p>
+<a href="/education/misc/rms-education-es-translation-to-en.txt">English</a>,
+<a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and
+<a href="/education/misc/edu-misc.html#transcription-rms-education">
+ other languages</a>.
+</p>
-<p>An article by Richard Stallman:
-<a href="/education/edu-schools.html">Why Schools Should Exclusively Use
-Free Software</a></p>
+<p>
+<!-- TRANSLATORS: please add the link to your language here in the first
+ place, followed by a comma. -->
-<p>An article by Dr. V. Sasi Kumar on the
-<a href="/education/edu-system-india.html">education system in India.</a></p>
+SubRip subtitle files are also available for download in
+<a href="/education/misc/rms-education-es-sub.en.srt">English</a>,
+<a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a>, and
+<a href="/education/misc/edu-misc.html#subtitles-rms-education">other
+ languages</a>.
+</p>
-</div>
-</div>
</div> <!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -172,7 +183,7 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 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
@@ -180,9 +191,9 @@
<!--#include virtual="/server/bottom-notes.html" -->
-<p></p><p class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/03/29 19:35:05 $
+$Date: 2014/04/28 08:28:05 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/education.ja.po
===================================================================
RCS file: /web/www/www/education/po/education.ja.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- education/po/education.ja.po 28 Apr 2014 08:10:42 -0000 1.28
+++ education/po/education.ja.po 28 Apr 2014 08:28:05 -0000 1.29
@@ -59,9 +59,9 @@
"that can be used for educational purposes. Contact <a href=\"mailto:"
"address@hidden"><address@hidden></a>."
msgstr ""
-"èªç±ãªæè²ã²ã¼ã ããæè²ç®çã«å©ç¨ã§ããèªç±ãªã²ã¼ã
ã®æ
å ±ãæ¢ãã¦ã"
-"ã¾ãã<a href=\"mailto:address@hidden"><address@hidden></a>ã¾ã§"
-"é£çµ¡ãã ããã"
+"èªç±ãªæè²ã²ã¼ã ããæè²ç®çã«å©ç¨ã§ããèªç±ãªã²ã¼ã
ã®æ
å ±ãæ¢ãã¦ãã¾ãã<a "
+"href=\"mailto:address@hidden"><address@hidden></a>ã¾ã§é£çµ¡ãã ã"
+"ãã"
#. type: Content of: <p>
msgid ""
@@ -75,14 +75,14 @@
"institutions. Free Software supports education, proprietary software forbids "
"education."
msgstr ""
-"ã½ããã¦ã§ã¢ã®èªç±ã¯æè²ã«ããã¦åºæ¬çãªå½¹å²ããã¯ããã¾ããããããéç¨"
-"ã®æè²æ©é¢ã¯èªç±ã½ããã¦ã§ã¢ãç¨ãã¦æè²ããã¹ãã§ãããªããªãã人éã®ç¥èã"
-"åºãããã社ä¼ã«ã¨ã£ã¦ããä¸å¡ã¨ãªãå¦çãè²ã¦ãããã¨ãã£ãæè²æ©é¢ããªãã¹"
-"ãä»»åã¯ãèªç±ã½ããã¦ã§ã¢ã«ãã£ã¦ã®ã¿å®ç¾ã§ããããã§ããèªç±ã½ããã¦ã§ã¢ã®"
-"ã½ã¼ã¹ã³ã¼ããææ³ã¯ã人éã®ç¥èã®ä¸é¨ã§ããå対ã«ããããã©ã¤ã¨ã¿ãªãªã½ãã"
-"ã¦ã§ã¢ã¯ç§å¯çã§å¶éãããç¥èã§ãããæè²æ©é¢ã®ä»»åã¨ã¯æ£å対ã®ãã®ã§ããèª"
-"ç±ã½ããã¦ã§ã¢ã¯æè²ãæ¯æ´ãã¾ããããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ã¯æè²ãå¶"
-"éãã¾ãã"
+"ã½ããã¦ã§ã¢ã®èªç±ã¯æè²ã«ããã¦åºæ¬çãªå½¹å²ããã¯ããã¾ããããããéç¨ã®æ"
+"è²æ©é¢ã¯èªç±ã½ããã¦ã§ã¢ãç¨ãã¦æè²ããã¹ãã§ãããªããªãã人éã®ç¥èãåºã"
+"ããã社ä¼ã«ã¨ã£ã¦ããä¸å¡ã¨ãªãå¦çãè²ã¦ãããã¨ãã£ãæè²æ©é¢ããªãã¹ãä»»"
+"åã¯ãèªç±ã½ããã¦ã§ã¢ã«ãã£ã¦ã®ã¿å®ç¾ã§ããããã§ããèªç±ã½ããã¦ã§ã¢ã®ã½ã¼"
+"ã¹ã³ã¼ããææ³ã¯ã人éã®ç¥èã®ä¸é¨ã§ããå対ã«ããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§"
+"ã¢ã¯ç§å¯çã§å¶éãããç¥èã§ãããæè²æ©é¢ã®ä»»åã¨ã¯æ£å対ã®ãã®ã§ããèªç±ã½"
+"ããã¦ã§ã¢ã¯æè²ãæ¯æ´ãã¾ããããããã©ã¤ã¨ã¿ãªãªã½ããã¦ã§ã¢ã¯æè²ãå¶éã"
+"ã¾ãã"
#. type: Content of: <p>
msgid ""
Index: licenses/license-list.ja.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ja.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- licenses/license-list.ja.html 24 Apr 2014 16:04:13 -0000 1.52
+++ licenses/license-list.ja.html 28 Apr 2014 08:28:05 -0000 1.53
@@ -1,7 +1,7 @@
<!--#include virtual="/server/header.ja.html" -->
-<!-- Parent-Version: 1.75 -->
+<!-- Parent-Version: 1.77 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<!--#set var="ENGLISH_PAGE" value="/licenses/license-list.en.html" -->
@@ -9,12 +9,82 @@
<title>ãã¾ãã¾ãªã©ã¤ã»ã³ã¹ã¨ãããã«ã¤ãã¦ã®è§£èª¬ -
GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</title>
<!--#include virtual="/licenses/po/license-list.translist" -->
+<style type="text/css" media="print,screen">
+<!--
+/* These statements are commented out in HTML to
+ make them untranslatable. */
+/* Definitions for color-coded border */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+ padding-left: 1em;
+ margin-left: 0;
+ margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double blue; }
+
+/* Disable legend for CSS1-only browsers:
+ they don't support :before and :after */
+#content div#legend { display: none; }
+/* Enable legend for CSS2+ browsers. */
address@hidden print,screen {
+#content div#legend { display: block; }
+}
+#content div#legend {
+ float: right;
+ width: auto; max-width: 100%;
+ font-style: normal;
+ padding: 0 1em 1em 1em;
+ margin: 2.5em 1.5em 1.5em 1.5em;
+ background: #f0f2f4;
+ border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#content div#legend dt { padding: 1em 0; margin: 0; }
+#content div#legend dd { margin: 0; }
+
+#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center;
font-weight: bold; }
+#legend dl.green dt:after, #legend dl.orange dt:after,
+#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+-->
+
+</style>
+
+<!-- These statements are split between different <style>
+ elements,
+ and their contents aren't commented out on purpose:
+ they should be translated, preferably as separate strings. -->
+<style type="text/css" media="print,screen">
+#legend blockquote:before { content: "Code for the left border"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.green dt:after {
+ content: "èªç±ã©ã¤ã»ã³ã¹ãGNU
GPLãããã¯FDLã¨ä¸¡ç«ãããã®";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.orange dt:after {
+ content: "èªç±ã©ã¤ã»ã³ã¹ãGNU GPLã¨FDLã¨ã¯ä¸¡ç«ããªããã®";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.red dt:after { content: "ä¸èªç±ãªã©ã¤ã»ã³ã¹"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.blue dt:after { content:
"è¦è§£ãè¿°ã¹ãä½åã®ããã®ã©ã¤ã»ã³ã¹"; }
+</style>
+
<!--#include virtual="/server/banner.ja.html" -->
<h2>ãã¾ãã¾ãªã©ã¤ã»ã³ã¹ã¨ãããã«ã¤ãã¦ã®è§£èª¬</h2>
+
<div class="toc">
-<h3><a id="TableOfContents">ããã</a></h3>
+<h3 id="TableOfContents">ããã</h3>
<ul>
<li><a href="#Introduction">ã¯ããã«</a></li>
@@ -34,16 +104,21 @@
</ul>
</li>
-<li><a
href="#OtherLicenses">ã½ããã¦ã§ã¢ãææ¸ä»¥å¤ã®å®ç¨ã®èä½ç©ã®ã©ã¤ã»ã³ã¹</a>
- <ul><li><a href="#Fonts">ãã©ã³ãã®ã©ã¤ã»ã³ã¹</a></li></ul>
- </li>
-<li><a href="#OpinionLicenses">è¦è§£ã示ãä½åã®ã©ã¤ã»ã³ã¹
(ä¾ãæè¦ãæ¨è¦æ)</a></li>
+<li><a href="#OtherLicenses">ã»ãã®ä½åã®ããã®ã©ã¤ã»ã³ã¹</a>
+ <ul>
+ <li><a
href="#OtherLicenses">ã½ããã¦ã§ã¢ãææ¸ä»¥å¤ã®å®ç¨ã®èä½ç©ã®ã©ã¤ã»ã³ã¹</a></li>
+ <li><a href="#Fonts">ãã©ã³ãã®ã©ã¤ã»ã³ã¹</a></li>
+ <li><a href="#OpinionLicenses">è¦è§£ã示ãä½åã®ã©ã¤ã»ã³ã¹
(ä¾ãæè¦ãæ¨è¦æ)</a></li>
+ </ul>
+</li>
</ul>
-</div> <!-- /class="toc" -->
+</div>
+<!-- /class="toc" -->
<div class="big-section">
-<h3 id="Introduction">ã¯ããã«</h3>
+<h3 id="Introduction">
+ ã¯ããã«</h3>
</div>
<div style="clear: left;"></div>
@@ -81,14 +156,23 @@
href="http://directory.fsf.org">èªç±ã½ããã¦ã§ã¢ã»ãã£ã¬ã¯ããª</a>ãã覧ãã
ãããèªç±ã½ããã¦ã§ã¢ã»ãã£ã¬ã¯ããªã¯6000以ä¸ã®èªç±ã½ããã¦ã§ã¢ããã±ã¼ã¸ã¨ãã®ã©ã¤ã»ã³ã·ã³ã°æ
å ±ãæ±ã£ã¦ãã¾ãã</p>
+<div id="legend">
+<blockquote></blockquote>
+<dl class="green"><dt></dt><dd></dd></dl>
+<dl class="orange"><dt></dt><dd></dd></dl>
+<dl class="red"><dt></dt><dd></dd></dl>
+<dl class="blue"><dt></dt><dd></dd></dl>
+</div>
+
<div class="big-section">
-<h3 id="SoftwareLicenses">ã½ããã¦ã§ã¢ã®ã©ã¤ã»ã³ã¹</h3>
+<h3 id="SoftwareLicenses">
+ ã½ããã¦ã§ã¢ã®ã©ã¤ã»ã³ã¹</h3>
</div>
<div style="clear: left;"></div>
<div class="big-subsection">
-<h4 id="GPLCompatibleLicenses"><span id="FreeLicenses"></span>
-GPLã¨ä¸¡ç«ããèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ </h4>
+<h4 id="GPLCompatibleLicenses">
+ <span
id="FreeLicenses"></span>GPLã¨ä¸¡ç«ããèªç±ã½ããã¦ã§ã¢ã»ã©ã¤ã»ã³ã¹</h4>
<span class="anchor-reference-id"> (<a
href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
</div>
@@ -98,7 +182,8 @@
href="#GNUGPL">GNU GPL</a>ã¨ä¸¡ç«ããã©ã¤ã»ã³ã¹ã§ãã</strong></p>
-<dl>
+<dl class="green">
+
<dt><!-- both generic and version-specific anchors -->
<a id="GNUGPL"></a> <a id="GNUGPLv3" href="/licenses/gpl.html">GNUä¸è¬å
¬è¡ã©ã¤ã»ã³ã¹
(GPL) ãã¼ã¸ã§ã³3</a> <span class="anchor-reference-id"> (<a
@@ -626,10 +711,12 @@
</dl>
-
+<!-- end class="green" -->
<hr class="separator" />
+
<div class="big-subsection">
-<h4
id="GPLIncompatibleLicenses">GPLã¨ä¸¡ç«ããªãèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹</h4>
+<h4 id="GPLIncompatibleLicenses">
+ GPLã¨ä¸¡ç«ããªãèªç±ã½ããã¦ã§ã¢ã»ã©ã¤ã»ã³ã¹</h4>
<span class="anchor-reference-id"> (<a
href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
</div>
@@ -639,8 +726,8 @@
href="#GNUGPL">GNU GPL</a>ã¨<a
href="/licenses/gpl-faq.html#WhatIsCompatible"><em>両ç«ããªã</em></a>ã©ã¤ã»ã³ã¹ã§ãã</strong></p>
+<dl class="orange">
-<dl>
<dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1">
ã¢ãã§ãä¸è¬å
¬è¡ã©ã¤ã»ã³ã¹ ãã¼ã¸ã§ã³1</a> <span
class="anchor-reference-id"> (<a
href="#AGPLv1.0">#AGPLv1.0</a>)</span></dt>
@@ -1055,13 +1142,13 @@
</dl>
-
+<!-- end class="orange" -->
<hr class="separator" />
-<!-- first id is singular, leave for compatibility: -->
+
<div class="big-subsection">
<span id="NonFreeSoftwareLicense"></span>
<h4 id="NonFreeSoftwareLicenses">
-ä¸èªç±ãªã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ </h4>
+ ä¸èªç±ãªã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹</h4>
<span class="anchor-reference-id"> (<a
href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
</div>
@@ -1077,17 +1164,21 @@
<p>ããããã¡ã¯ãä¸èªç±ãªã½ããã¦ã§ã¢ããã±ã¼ã¸ã®å©ç¨ã宣ä¼ã奨å±ãä¿é²ãããããªãµã¤ãã¸ã¯ãªã³ã¯ãå¼µããªãã¨ããããªã·ã¼ãæãã¦ãã¾ãããã®ä¸è¬ããªã·ã¼ã«éåããã«ããã§ããã¨ãã¯ããããã®ã©ã¤ã»ã³ã¹ã¸ã®ãªã³ã¯ãæä¾ãã¦ãã¾ããä¸çªãããããªãã®ã¯ãä¸èªç±ãªããã°ã©ã
ã«ç¡æã§å®£ä¼ã®æ©ä¼ãä¸ããããå¤ãã®äººã
ãããã使ããã¨ã奨å±ãã¦ãã¾ãã¨ãããã¨ã§ããåãçç±ãããããããã¡ã¯ãä½ãç¹å¥ãªçç±ã§ãããéå¹æã«ãªããªãã¨èããããªãéããã©ã¤ã»ã³ã¹ã使ããã¦ããããã°ã©ã
ã®ååãæãããã¨ãé¿ããããã«ãã¦ãã¾ãã</p>
-<dl>
+<dl class="red">
+
<dt><a id="NoLicense">ã©ã¤ã»ã³ã¹ãªã</a> <span
class="anchor-reference-id"> (<a
href="#NoLicense">#NoLicense</a>)</span></dt>
<dd>
<p>ãããã½ã¼ã¹ã³ã¼ããã¦ã¼ã¶ã«4ã¤ã®éè¦ãªèªç±ãä¸ããã©ã¤ã»ã³ã¹ãéã°ãªãå
´åãããã¯èªç±ã½ããã¦ã§ã¢ã§ã¯ããã¾ããã</p>
-<p>ä½äººãã®éçºè
ã¯ãã©ã¤ã»ã³ã¹ããªãã³ã¼ãã¯ãããªãã¯ã»ãã¡ã¤ã³ã
ã¨èãã¾ããä»æ¥ã®èä½æ¨©æ³ã§ã¯ãããã¯äºå®ã§ã¯ããã¾ãããããããæå®ããªããã°ããã¹ã¦ã®èä½ç©ã¯ä¸èªç±ã§ããããã«ã¯ããã°ã©ã
ãå«ã¾ãã¾ããããå½ã
ã§ã¯ãã©ã¤ã»ã³ã¹ãªãã®ã³ã¼ãããã¦ã³ãã¼ãããã¦ã¼ã¶ããåã«ã³ã³ãã¤ã«ãããã¯å®è¡ããã
ãã§èä½æ¨©ã«éåãããã¨ããããã¾ãã</p>
+<p>ä½äººãã®éçºè
ã¯ãã©ã¤ã»ã³ã¹ããªãã³ã¼ãã¯<a
+href="#PublicDomain">ãããªãã¯ã»ãã¡ã¤ã³</a>ã
ã¨èãã¾ããä»æ¥ã®èä½æ¨©æ³ã§ã¯ãããã¯äºå®ã§ã¯ããã¾ãããããããæå®ããªããã°ããã¹ã¦ã®èä½ç©ã«ã¯èä½æ¨©ãããã¾ããããã«ã¯ããã°ã©ã
ãå«ã¾ãã¾ããã¦ã¼ã¶ã«èªç±ãä¸ããã©ã¤ã»ã³ã¹ããªãå
´åããã®ããã°ã©ã
ã«ã¯ãªãã®èªç±ãããã¾ãããããå½ã
ã§ã¯ãã©ã¤ã»ã³ã¹ãªãã®ã³ã¼ãããã¦ã³ãã¼ãããã¦ã¼ã¶ããåã«ã³ã³ãã¤ã«ãããã¯å®è¡ããã
ãã§èä½æ¨©ã«éåãããã¨ããããã¾ãã</p>
<p>ããã°ã©ã ãèªç±ã¨ããããã«ã¯ãèä½æ¨©è
ã¯ã¦ã¼ã¶ã«å¯¾ãã¦æ示çã«ã<a
href="/philosophy/free-sw.html">4ã¤ã®éè¦ãªèªç±</a>ãä¸ããå¿
è¦ãããã¾ããããããææ¸ã¯ã<em>èªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹</em>ã¨å¼ã°ãã¾ãããããèªç±ã½ããã¦ã§ã¢ã©ã¤ã»ã³ã¹ã®ç®çã§ãã</p>
+<p>åè¡å½èä½æ¨©æ³ã¯ãæ示çã«ããããããªãã¯ãã¡ã¤ã³ã«ããã®ã§ãåè¡å½æ¿åºã®éç¨ããè
ã«ãã£ã¦æ¸ãããã³ã¼ãã¯ç¹å¥ãªä¾å¤ã§ããããããããã¯åè¡å½ãããä¼ç¤¾ã«æ¸ããã¨ã«ã¤ãã¦æ¯æã£ãå
´åã®ä½åã«ã¯é©ç¨ããã¾ãããã¾ãããã®ä»ã®å½ã
ã«ãé©ç¨ããã¾ãããå¤ãã®å½ã§ã¯ãæ¿åºã®èä½ç©ã«èä½æ¨©ãæãããã¨ãèªãã¦ãã¾ãã</p>
+
<p>ããå½ã
ã§ã¯ãèè
ãã³ã¼ãããããªãã¯ã»ãã¡ã¤ã³ã«ãããã¨ãèªãã¾ãããæ示çãªè¡çºãå¿
è¦ã¨ãã¾ãããããããå ´åãæ¨å¥¨ããæ¹æ³ã¯<a
href="#CC0">CC0</a>ã使ããã¨ã§ããããã¯ãå¤ããå°ãªãããããªãã¯ã»ãã¡ã¤ã³ã¨åçã®ã©ã¤ã»ã³ã¹ãç½®ããã¨ã§ãã»ãã®å½ã
ã§ãå¹æãæã¡ã¾ããããããã»ã¨ãã©ã®å ´åã<a
href="/licenses/license-recommendations.html">ã³ãã¼ã¬ããã¨ããæ¹ãè¯ãã§ãããã</a>ããã§ãã³ã¼ãã®ãã¹ã¦ã®ã¦ã¼ã¶ã«ãã®èªç±ãå±ããã¨ãä¿è¨¼ã§ãã¾ãã</p>
@@ -1157,6 +1248,12 @@
href="#eCos20">eCosã¯å©ç¨å¯è½ã¨ãªã£ã¦ãã¾ãã</a></p></dd>
+<dt><a id="DOR" href="http://dorepository.org/download.html"> CNRI
ãã£ã¸ã¿ã«ãªãã¸ã§ã¯ã
+ãªãã¸ã㪠ã©ã¤ã»ã³ã¹åæ</a> <span class="anchor-reference-id">
(<a
+href="#DOR">#DOR</a>)</span></dt>
+<dd>
+<p>ãã®ã©ã¤ã»ã³ã¹ã¯ããã®ç¬¬ä¸é
ãããããããã®ã¦ã¼ã¶ãå®è¡ãã<em>ãããªã</em>ããã°ã©ã
(ãããã©ã¤ã¨ã¿ãªã®ããã°ã©ã
ã§ããã)ã®ã©ã¤ã»ã³ã¹ã«ãéåããªããã¨ã®è¦æ±ãå«ãã§ããããä¸èªç±ã§ãã</p></dd>
+
<dt><a id="GPL-PA"
href="http://directory.fsf.org/wiki/License:GPL-PA">è¡æ¿æ©é¢ã®ã³ã³ãã¥ã¼ã¿ã»ããã°ã©ã
ã®GPL</a>
<span class="anchor-reference-id"> (<a href="#GPL-PA">#GPL-PA</a>)</span></dt>
@@ -1357,29 +1454,44 @@
</dl>
+<!-- end class="red" -->
<div class="big-section">
-<h3 id="DocumentationLicenses">ææ¸åãã©ã¤ã»ã³ã¹</h3>
+<h3 id="DocumentationLicenses">
+ ææ¸ã®ã©ã¤ã»ã³ã¹</h3>
</div>
<div style="clear: left;"></div>
<div class="big-subsection">
-<h4 id="FreeDocumentationLicenses">èªç±ãªææ¸ã©ã¤ã»ã³ã¹ </h4>
+<h4 id="FreeDocumentationLicenses">
+ èªç±ãªææ¸ã©ã¤ã»ã³ã¹</h4>
<span class="anchor-reference-id"> (<a
href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>) </span>
</div>
-
<p><strong>以ä¸ã«æããã®ã¯ã<a
href="/philosophy/free-doc.html">èªç±ãªææ¸</a>ã©ã¤ã»ã³ã¹ã¨ãã¦èªããããã©ã¤ã»ã³ã¹ã§ãã</strong></p>
-<dl>
+<dl class="green">
+
<dt><a id="FDL" href="/licenses/fdl.html">GNUèªç±ææ¸ã©ã¤ã»ã³ã¹</a>
<span
class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
<dd>
<p>ããã¯ãã³ãã¼ã¬ããã®èªç±ãªææ¸ã«ä½¿ããã¨ãç®çã¨ããã©ã¤ã»ã³ã¹ã§ããããããã¡ã¯ãããããã¹ã¦ã®GNUããã¥ã¢ã«ã«é©ç¨ããäºå®ã§ããã¾ãããã®ã©ã¤ã»ã³ã¹ã¯ãã®ä»ã®ç¨®é¡ã®å®ç¨çãªèä½ç©(ãã¨ãã°æç§æ¸ãè¾æ¸ãªã©)ã«ãåãã¦ãã¾ãããã®ã©ã¤ã»ã³ã¹ã®é©ç¨ã¯ããã¹ãä½å(ãæ¸ç±ã)ã«éå®ããã¾ããã</p></dd>
+<dt><a id="FreeBSDDL"
+href="http://directory.fsf.org/wiki?title=License:FreeBSD">
+FreeBSDææ¸ã©ã¤ã»ã³ã¹</a> <span class="anchor-reference-id"> (<a
+href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
+<dd>
+<p>ããã¯å¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ææ¸ã©ã¤ã»ã³ã¹ã§ãGNU
FDL ã¨ä¸¡ç«ãã¾ãã</p></dd>
+
+</dl>
+<!-- end class="green" -->
+<dl class="orange">
+
+
<dt><a id="ACDL"
href="http://fedoraproject.org/wiki/Licensing/Common_Documentation_License">Appleã®å
±éææ¸ã©ã¤ã»ã³ã¹
(Common Documentation License)ããã¼ã¸ã§ã³ 1.0</a> <span
@@ -1390,14 +1502,6 @@
FDLã«ã¯ãã®å
±éææ¸ã©ã¤ã»ã³ã¹ã§ã¯èæ
®ããã¦ããªã追å
çæ¡é
ãå«ã¾ãã¦ããããã§ãã</p></dd>
-<dt><a id="FreeBSDDL"
-href="http://directory.fsf.org/wiki?title=License:FreeBSD">
-FreeBSDææ¸ã©ã¤ã»ã³ã¹</a> <span class="anchor-reference-id"> (<a
-href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
-<dd>
-<p>ããã¯å¯å®¹ãªã³ãã¼ã¬ããã§ãªãèªç±ææ¸ã©ã¤ã»ã³ã¹ã§ãGNU
FDL ã¨ä¸¡ç«ãã¾ãã</p></dd>
-
-
<dt><!-- old id, leave for compatibility -->
<a id="RealOPL"></a> <a id="OpenPublicationL"
href="http://opencontent.org/openpub/">ãªã¼ãã³ãããªã±ã¼ã·ã§ã³ã©ã¤ã»ã³ã¹ããã¼ã¸ã§ã³1.0</a>
<span
@@ -1419,10 +1523,12 @@
</dl>
-
+<!-- end class="orange" -->
<hr class="separator" />
+
<div class="big-subsection">
-<h4 id="NonFreeDocumentationLicenses">ä¸èªç±ãªææ¸ã©ã¤ã»ã³ã¹ </h4>
+<h4 id="NonFreeDocumentationLicenses">
+ ä¸èªç±ãªææ¸ã®ã©ã¤ã»ã³ã¹</h4>
<span class="anchor-reference-id"> (<a
href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
</span>
@@ -1431,7 +1537,8 @@
<p><strong>以ä¸ã«æããã®ã¯ãèªç±ãªææ¸ã©ã¤ã»ã³ã¹ã¨ã¯<em>èªããããªã</em>ã©ã¤ã»ã³ã¹ã®ä¸è¦§ã§ãã</strong></p>
-<dl>
+<dl class="red">
+
<dt><!-- brief id, leave for compatibility -->
<a id="OCL"></a> <a id="OpenContentL"
href="http://opencontent.org/opl.shtml">ãªã¼ãã³ã³ã³ãã³ãã©ã¤ã»ã³ã¹ããã¼ã¸ã§ã³1.0</a>
<span
@@ -1446,14 +1553,20 @@
</dl>
+<!-- end class="red" -->
<div class="big-section">
-<h3
id="OtherLicenses">ã½ããã¦ã§ã¢ãææ¸ä»¥å¤ã®å®ç¨çãªèä½ç©åãã©ã¤ã»ã³ã¹</h3>
+<h3 id="OtherLicenses">ã»ãã®ä½åã®ããã®ã©ã¤ã»ã³ã¹</h3>
+</div>
+<div style="clear: left;"></div>
+
+<div class="big-subsection">
+<h4>ã½ããã¦ã§ã¢ãææ¸ä»¥å¤ã®å®ç¨ã®èä½ç©ã®ã©ã¤ã»ã³ã¹</h4>
<span class="anchor-reference-id"> (<a
href="#OtherLicenses">#OtherLicenses</a>)</span>
</div>
-<div style="clear: left;"></div>
-<dl>
+<dl class="green">
+
<dt><a id="GPLOther" href="/licenses/gpl.html">GNU ä¸è¬å
¬è¡ã©ã¤ã»ã³ã¹</a> <span
class="anchor-reference-id"> (<a href="#GPLOther">#GPLOther</a>)</span></dt>
<dd>
@@ -1468,6 +1581,10 @@
ã¯ãããããããã¯ã®æç§æ¸ãæè²ç¨è³æã«æ¨å¥¨ããã¦ãã¾ã(ãææ¸ãã¯åã«ã½ããã¦ã§ã¢ããã®ä»ã®æ©æã使ãããã®æç§æ¸ããã®ä»ã®æè²ç¨è³æãæå³ãã¾ãã)
ããããã¡ã¯ãGNU FDLãè¾æ¸ãç¾ç§äºå
¸ããã®ã»ãã®å®ç¨çãªæ
å
±ãæä¾ããä½åã«ãæ¨å¥¨ãã¦ãã¾ãã</p></dd>
+</dl>
+<!-- end class="green" -->
+<dl class="orange">
+
<dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode">
Creative Commons Attribution 2.0 ã©ã¤ã»ã³ã¹</a> (å¥å CC BY) <span
@@ -1514,15 +1631,16 @@
</dl>
-
+<!-- end class="orange" -->
<div class="big-subsection">
-<h4 id="Fonts">ãã©ã³ãã®ã©ã¤ã»ã³ã¹ </h4>
-<span class="anchor-reference-id">(<a href="#Fonts">#Fonts</a>)</span>
+<h4 id="Fonts">
+ ãã©ã³ãã®ã©ã¤ã»ã³ã¹</h4>
+<span class="anchor-reference-id"> (<a href="#Fonts">#Fonts</a>)</span>
</div>
<p>以ä¸ã®ã©ã¤ã»ã³ã¹ã¯ãè¸è¡ã®ãã¶ã¤ã³ã§ã¯ãªããã³ã³ãã¥ã¼ã¿ãã¡ã¤ã«ã§ã®ãã¶ã¤ã³ã®å
·ä½åã«é©ç¨ããã¾ããããããã¡ã®ç¥ãéãããã¶ã¤ã³ã®å®è£
ã§ã¯å¸¸ã«èä½æ¨©ãçºçãã¾ããè¸è¡ãã¶ã¤ã³ã®æ³çãªç¶æ³ã¯è¤éã§ç®¡è½ã«ããå¤åãã¾ãã</p>
-<dl>
+<dl class="green">
<dt><a id="GPLFonts" href="/licenses/gpl.html">GNUä¸è¬å
¬è¡ã©ã¤ã»ã³ã¹</a> <span
class="anchor-reference-id"> (<a href="#GPLFonts">#GPLFonts</a>)</span></dt>
@@ -1532,6 +1650,9 @@
href="/licenses/gpl-faq.html#FontException">ãã©ã³ãä¾å¤</a>ã使ã£ã¦ãã
ãããã¾ãã<a
href="http://www.fsf.org/blogs/licensing/20050425novalis">GPLãã©ã³ãä¾å¤ã®èª¬æè¨äº</a>ãã覧ãã
ããã</p></dd>
+</dl>
+<!-- end class="green" -->
+<dl class="orange">
<dt><a id="Arphic"
href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE">Arphic
@@ -1551,8 +1672,10 @@
</dl>
+<!-- end class="orange" -->
<div class="big-subsection">
-<h4 id="OpinionLicenses">è¦è§£ã示ãä½åã®ã©ã¤ã»ã³ã¹
(ä¾ãæè¦ãæ¨è¦æ) </h4>
+<h4 id="OpinionLicenses">
+ è¦è§£ã示ãä½åã®ã©ã¤ã»ã³ã¹ (ä¾ãæè¦ãæ¨è¦æ)</h4>
<span class="anchor-reference-id"> (<a
href="#OpinionLicenses">#OpinionLicenses</a>)</span>
</div>
@@ -1565,7 +1688,8 @@
<p>ãã®ç¯çã«ã¯ããããã®ã©ã¤ã»ã³ã¹ãããã¾ãããããã®ãã¹ã¦ãæãããã¨ã¯ã§ãã¾ãããããããªãããããªãèªèº«ã使ããã®ãæ¢ãã¦ããå
´åãããããã¡ãæ¨å¥¨ãããã®ã¯äºã¤ããã¾ã:</p>
-<dl>
+<dl class="blue">
+
<dt><a id="GNUVerbatim" href="/licenses/licenses.html#VerbatimCopying">GNU
ãã®ã¾ã¾ã³ãã¼(Verbatim Copying)ã©ã¤ã»ã³ã¹</a> <span
class="anchor-reference-id"> (<a
href="#GNUVerbatim">#GNUVerbatim</a>)</span></dt>
@@ -1583,13 +1707,12 @@
</dl>
-
+<!-- end class="blue" -->
<hr class="separator" />
-<p class="back">
-<strong><a
href="/licenses/licenses.html">ã©ã¤ã»ã³ã¹ã«ã¤ãã¦ãããªãæ
å
±ã</a></strong>
-</p>
-<div style="font-size: small;">
+
+<p class="back"><strong><a
href="/licenses/licenses.html">ã©ã¤ã»ã³ã¹ã«ã¤ãã¦ãããªãæ
å
±</a></strong></p>
+<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
</div>
@@ -1598,6 +1721,7 @@
<!-- 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
@@ -1622,8 +1746,9 @@
æ£ç¢ºã§è¯ãå質ã®ç¿»è¨³ãæä¾ããããåªåãã¦ãã¾ãããä¸å®å
¨ãªå
´åããããã¨æãã¾ãã翻訳ã«é¢ããã³ã¡ã³ãã¨ææ¡ã¯ã<a
href="mailto:address@hidden"><address@hidden></a>ã«ãããããã¾ããããããã¡ã®ã¦ã§ããã¼ã¸ã®ç¿»è¨³ã®èª¿æ´ã¨æåºã«ã¤ãã¦ã¯ã<a
href="/server/standards/README.translations.html">翻訳
README</a>ãã覧ãã ããã</p>
+</div>
-<p>Copyright © 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014 Free Software Foundation, Inc.</p>
<p>ãã®ãã¼ã¸ã¯<a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative Commons
@@ -1635,11 +1760,10 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
</div>
-
- <p><!-- timestamp start -->
+<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2014/04/24 16:04:13 $
+$Date: 2014/04/28 08:28:05 $
<!-- 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- licenses/po/license-list.ja-en.html 3 Feb 2014 02:58:38 -0000 1.11
+++ licenses/po/license-list.ja-en.html 28 Apr 2014 08:28:06 -0000 1.12
@@ -1,12 +1,82 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.75 -->
+<!-- Parent-Version: 1.77 -->
<title>Various Licenses and Comments about Them
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/licenses/po/license-list.translist" -->
+
+<style type="text/css" media="print,screen">
+<!--
+/* These statements are commented out in HTML to
+ make them untranslatable. */
+/* Definitions for color-coded border */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+ padding-left: 1em;
+ margin-left: 0;
+ margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double blue; }
+
+/* Disable legend for CSS1-only browsers:
+ they don't support :before and :after */
+#content div#legend { display: none; }
+/* Enable legend for CSS2+ browsers. */
address@hidden print,screen {
+#content div#legend { display: block; }
+}
+#content div#legend {
+ float: right;
+ width: auto; max-width: 100%;
+ font-style: normal;
+ padding: 0 1em 1em 1em;
+ margin: 2.5em 1.5em 1.5em 1.5em;
+ background: #f0f2f4;
+ border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#content div#legend dt { padding: 1em 0; margin: 0; }
+#content div#legend dd { margin: 0; }
+
+#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center;
font-weight: bold; }
+#legend dl.green dt:after, #legend dl.orange dt:after,
+#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+-->
+</style>
+<!-- These statements are split between different <style> elements,
+ and their contents aren't commented out on purpose:
+ they should be translated, preferably as separate strings. -->
+<style type="text/css" media="print,screen">
+#legend blockquote:before { content: "Code for the left border"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.green dt:after {
+ content: "Free licenses, compatible with the GNU GPL or FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.orange dt:after {
+ content: "Free licenses, incompatible with the GNU GPL and FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.red dt:after { content: "Nonfree licenses"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
+</style>
+
<!--#include virtual="/server/banner.html" -->
<h2>Various Licenses and Comments about Them</h2>
-<h3><a id="TableOfContents">Table of Contents</a></h3>
+
+<div class="toc">
+
+<h3 id="TableOfContents">Table of Contents</h3>
<ul>
<li><a href="#Introduction">Introduction</a></li>
@@ -29,16 +99,24 @@
</ul>
</li>
-<li><a href="#OtherLicenses">
- Licenses for Works of Practical Use Besides Software and Documentation</a>
- <ul><li><a href="#Fonts">Licenses for Fonts</a></li></ul>
- </li>
-<li><a href="#OpinionLicenses">
- Licenses for Works stating a Viewpoint (e.g., Opinion or
Testimony)</a></li>
+<li><a href="#OtherLicenses">Licenses for Other Works</a>
+ <ul>
+ <li><a href="#OtherLicenses">Licenses for Works of Practical Use
+ besides Software and Documentation</a></li>
+ <li><a href="#Fonts">Licenses for Fonts</a></li>
+ <li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
+ (e.g., Opinion or Testimony)</a></li>
+ </ul>
+</li>
</ul>
+</div> <!-- /class="toc" -->
-<h2><a id="Introduction">Introduction</a></h2>
+<div class="big-section">
+<h3 id="Introduction">
+ Introduction</h3>
+</div>
+<div style="clear: left;"></div>
<p>We classify a license according to certain key criteria:</p>
@@ -98,14 +176,27 @@
their licensing information.</p>
-<h2><a id="SoftwareLicenses">Software Licenses</a></h2>
+<div id="legend">
+<blockquote></blockquote>
+<dl class="green"><dt></dt><dd></dd></dl>
+<dl class="orange"><dt></dt><dd></dd></dl>
+<dl class="red"><dt></dt><dd></dd></dl>
+<dl class="blue"><dt></dt><dd></dd></dl>
+</div>
-<h3><a id="FreeLicenses"></a>
- <a id="GPLCompatibleLicenses">
- GPL-Compatible Free Software Licenses</a>
- <span class="anchor-reference-id">
+<div class="big-section">
+<h3 id="SoftwareLicenses">
+ Software Licenses</h3>
+</div>
+<div style="clear: left;"></div>
+
+<div class="big-subsection">
+<h4 id="GPLCompatibleLicenses">
+ <span id="FreeLicenses"></span>
+ GPL-Compatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
(<a href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
-</h3>
+</div>
<p><strong>The following licenses qualify as <a
href="/philosophy/free-sw.html">free software</a>
@@ -113,7 +204,8 @@
GPL</a>.</strong></p>
-<dl>
+<dl class="green">
+
<dt><a id="GNUGPL"></a> <!-- both generic and version-specific anchors -->
<a id="GNUGPLv3" href="/licenses/gpl.html">
GNU General Public License (GPL) version 3</a>
@@ -904,23 +996,24 @@
<p>This is a lax, permissive non-copyleft free software license
which is compatible with the GNU GPL.</p></dd>
-</dl>
+</dl> <!-- end class="green" -->
+<hr class="separator" />
-<hr />
-<h3><a id="GPLIncompatibleLicenses">
- GPL-Incompatible Free Software Licenses</a>
- <span class="anchor-reference-id">
+<div class="big-subsection">
+<h4 id="GPLIncompatibleLicenses">
+ GPL-Incompatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
(<a href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
-</h3>
+</div>
<p><strong>The following licenses
are <a href="/philosophy/free-sw.html">free software</a> licenses, but
are <a href="/licenses/gpl-faq.html#WhatIsCompatible"><em>not
compatible</em></a> with the <a href="#GNUGPL">GNU GPL</a>.</strong></p>
+<dl class="orange">
-<dl>
<dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1">
Affero General Public License version 1</a>
<span class="anchor-reference-id">
@@ -1513,16 +1606,17 @@
<p><a href="#Zope20">Version 2.0 of the Zope Public License</a> is
GPL-compatible.</p></dd>
-</dl>
+</dl> <!-- end class="orange" -->
+<hr class="separator" />
-<hr /> <!-- first id is singular, leave for compatibility: -->
-<h3><a id="NonFreeSoftwareLicense"></a>
- <a id="NonFreeSoftwareLicenses">
- Nonfree Software Licenses</a>
- <span class="anchor-reference-id">
+<div class="big-subsection">
+<span id="NonFreeSoftwareLicense"></span>
+<h4 id="NonFreeSoftwareLicenses">
+ Nonfree Software Licenses</h4>
+<span class="anchor-reference-id">
(<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-</h3>
+</div>
<p><strong>The following licenses <em>do not qualify</em> as <a
href="/philosophy/free-sw.html">free software</a>
@@ -1547,7 +1641,8 @@
unless we think that for specific reasons it won't backfire.</p>
-<dl>
+<dl class="red">
+
<dt><a id="NoLicense">No license</a>
<span class="anchor-reference-id">
(<a href="#NoLicense">#NoLicense</a>)</span></dt>
@@ -1555,11 +1650,13 @@
<p>If source code does not carry a license to give users the
four essential freedoms, it is not free software.</p>
-<p>Some developers think that code with no license is in the public
-domain. That is not true under today's copyright law; rather, all
-copyrightable works are nonfree by default. This includes programs.
-In some countries, users that download code with no license may
-infringe copyright merely by compiling it or running it.</p>
+<p>Some developers think that code with no license
+is <a href="#PublicDomain">in the public domain</a>. That is not true
+under today's copyright law; rather, all copyrightable works are
+copyrighted by default. This includes programs. Absent a license to
+grant users freedom, they don't have any. In some countries, users
+that download code with no license may infringe copyright merely by
+compiling it or running it.</p>
<p>In order for a program to be free, its copyright holders must
explicitly grant users the <a href="/philosophy/free-sw.html"> four
@@ -1567,6 +1664,12 @@
a <em>free software license</em>. This is what free software
licenses are for.</p>
+<p>Code written by employees of the US government is a special
+exception, since US copyright law explicitly puts that in the public
+domain; but this does not apply to works that the US pays a company to
+write. It also does not apply to other countries, many of which do
+allow the state to have a copyright on government writings.</p>
+
<p>Some countries allow authors to put code in the public domain, but
that requires explicit action. If you wish to do that, the method we
recommend is to use <a href="#CC0">CC0</a>, which also works in other
@@ -1668,6 +1771,16 @@
additional permission for linking with nonfree programs.</p></dd>
+<dt><a id="DOR"
+ href="http://dorepository.org/download.html">
+ CNRI Digital Object Repository License Agreement</a>
+ <span class="anchor-reference-id">
+ (<a href="#DOR">#DOR</a>)</span></dt>
+<dd>
+<p>This license is non-free because of Article 3, which arguably
+includes a requirement not to violate the license of <em>any</em>
+program that the user runs—even proprietary programs.</p></dd>
+
<dt><a id="GPL-PA"
href="http://directory.fsf.org/wiki/License:GPL-PA">
GPL for Computer Programs of the Public Administration</a>
@@ -1951,22 +2064,29 @@
<p>(The YaST software itself no longer uses this nonfree YaST license;
happily, it is now free software, released under the GNU GPL.)</p></dd>
-</dl>
+</dl> <!-- end class="red" -->
-<h2><a id="DocumentationLicenses">Licenses For Documentation</a></h2>
+<div class="big-section">
+<h3 id="DocumentationLicenses">
+ Licenses For Documentation</h3>
+</div>
+<div style="clear: left;"></div>
-<h3><a id="FreeDocumentationLicenses">Free Documentation Licenses</a>
- <span class="anchor-reference-id">
+<div class="big-subsection">
+<h4 id="FreeDocumentationLicenses">
+ Free Documentation Licenses</h4>
+<span class="anchor-reference-id">
(<a href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>)
</span>
-</h3>
+</div>
<p><strong>The following licenses qualify as <a
href="/philosophy/free-doc.html">free
documentation</a> licenses.</strong></p>
-<dl>
+<dl class="green">
+
<dt><a id="FDL" href="/licenses/fdl.html">
GNU Free Documentation License</a>
<span class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
@@ -1978,6 +2098,19 @@
(“books”).</p></dd>
+<dt><a id="FreeBSDDL"
+ href="http://directory.fsf.org/wiki?title=License:FreeBSD">
+ FreeBSD Documentation License</a>
+ <span class="anchor-reference-id">
+ (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
+<dd>
+<p>This is a permissive non-copyleft free documentation license that is
+compatible with the GNU FDL.</p></dd>
+
+</dl> <!-- end class="green" -->
+<dl class="orange">
+
+
<dt><a id="ACDL"
href="http://fedoraproject.org/wiki/Licensing/Common_Documentation_License">
Apple's Common Documentation License, Version 1.0</a>
@@ -1990,16 +2123,6 @@
Documentation License.</p></dd>
-<dt><a id="FreeBSDDL"
- href="http://directory.fsf.org/wiki?title=License:FreeBSD">
- FreeBSD Documentation License</a>
- <span class="anchor-reference-id">
- (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
-<dd>
-<p>This is a permissive non-copyleft free documentation license that is
-compatible with the GNU FDL.</p></dd>
-
-
<dt><a id="RealOPL"></a> <!-- old id, leave for compatibility -->
<a id="OpenPublicationL" href="http://opencontent.org/openpub/">
Open Publication License, Version 1.0</a>
@@ -2037,22 +2160,24 @@
abbreviation “OPL” for either license. It is worth spelling
their names in full to make sure people understand what you say.</p></dd>
-</dl>
+</dl> <!-- end class="orange" -->
+<hr class="separator" />
-<hr />
-<h3><a id="NonFreeDocumentationLicenses">
- Nonfree Documentation Licenses</a>
- <span class="anchor-reference-id">
+<div class="big-subsection">
+<h4 id="NonFreeDocumentationLicenses">
+ Nonfree Documentation Licenses</h4>
+<span class="anchor-reference-id">
(<a href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
</span>
-</h3>
+</div>
<p><strong>The following licenses <em>do not qualify</em>
as free documentation licenses:</strong></p>
-<dl>
+<dl class="red">
+
<dt><a id="OCL"></a> <!-- brief id, leave for compatibility -->
<a id="OpenContentL" href="http://opencontent.org/opl.shtml">
Open Content License, Version 1.0</a>
@@ -2069,16 +2194,22 @@
spelling their names in full to make sure people understand what you
say.</p></dd>
-</dl>
+</dl> <!-- end class="red" -->
-<h2><a id="OtherLicenses">
- Licenses for Works of Practical Use Besides Software and Documentation</a>
- <span class="anchor-reference-id">
+<div class="big-section">
+<h3 id="OtherLicenses">Licenses for Other Works</h3>
+</div>
+<div style="clear: left;"></div>
+
+<div class="big-subsection">
+<h4>Licenses for Works of Practical Use
+ besides Software and Documentation</h4>
+<span class="anchor-reference-id">
(<a href="#OtherLicenses">#OtherLicenses</a>)</span>
-</h2>
+</div>
+<dl class="green">
-<dl>
<dt><a id="GPLOther" href="/licenses/gpl.html">
GNU General Public License</a>
<span class="anchor-reference-id">
@@ -2103,6 +2234,9 @@
recommend the GNU FDL for dictionaries, encyclopedias, and any other
works that provide information for practical use.</p></dd>
+</dl> <!-- end class="green" -->
+<dl class="orange">
+
<dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode">
Creative Commons Attribution 2.0 license</a>
@@ -2173,19 +2307,21 @@
copyrightable, so we don't recommend using it; however, there is no
reason to avoid using data released this way.</p></dd>
-</dl>
+</dl> <!-- end class="orange" -->
-
-<h3><a id="Fonts">Licenses for Fonts</a>
- <span class="anchor-reference-id">(<a href="#Fonts">#Fonts</a>)</span>
-</h3>
+<div class="big-subsection">
+<h4 id="Fonts">
+ Licenses for Fonts</h4>
+<span class="anchor-reference-id">
+ (<a href="#Fonts">#Fonts</a>)</span>
+</div>
<p>The licenses below apply to an instantiation of a design in a computer
file, not the artistic design. As far as we know, an implementation of
a design is always copyrightable. The legal status of the artistic
design is complex, and varies by jurisdiction.</p>
-<dl>
+<dl class="green">
<dt><a id="GPLFonts" href="/licenses/gpl.html">
GNU General Public License</a>
@@ -2201,6 +2337,8 @@
href="http://www.fsf.org/blogs/licensing/20050425novalis">explanatory
essay about the GPL Font Exception</a>.</p></dd>
+</dl> <!-- end class="green" -->
+<dl class="orange">
<dt><a id="Arphic"
href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE">
@@ -2225,12 +2363,14 @@
harmless. Neither we nor SIL recommend the use of this license for
anything other than fonts.</p></dd>
-</dl>
+</dl> <!-- end class="orange" -->
-<h2><a id="OpinionLicenses"> Licenses for Works stating a Viewpoint (e.g.,
Opinion or Testimony)</a>
- <span class="anchor-reference-id">
+<div class="big-subsection">
+<h4 id="OpinionLicenses">
+ Licenses for Works stating a Viewpoint (e.g., Opinion or Testimony)</h4>
+<span class="anchor-reference-id">
(<a href="#OpinionLicenses">#OpinionLicenses</a>)</span>
-</h2>
+</div>
<p>Works that express someone's opinion—memoirs, editorials, and
so on—serve a fundamentally different purpose than works for
@@ -2247,7 +2387,8 @@
two that we recommend:</p>
-<dl>
+<dl class="blue">
+
<dt><a id="GNUVerbatim" href="/licenses/licenses.html#VerbatimCopying">
GNU Verbatim Copying License</a>
<span class="anchor-reference-id">
@@ -2272,14 +2413,16 @@
Please <a href="#which-cc">be specific about which Creative
Commons license is being used</a>.</p></dd>
-</dl>
+</dl> <!-- end class="blue" -->
+
+<hr class="separator" />
-<hr />
-<strong><a href="/licenses/licenses.html">More about licenses.</a></strong>
+<p class="back"><strong><a href="/licenses/licenses.html">More about
licenses</a></strong></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
@@ -2303,8 +2446,9 @@
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 © 2012 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014 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
@@ -2312,9 +2456,9 @@
<!--#include virtual="/server/bottom-notes.html" -->
-<p>Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/02/03 02:58:38 $
+$Date: 2014/04/28 08:28:06 $
<!-- 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.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- licenses/po/license-list.ja.po 28 Apr 2014 08:10:43 -0000 1.45
+++ licenses/po/license-list.ja.po 28 Apr 2014 08:28:06 -0000 1.46
@@ -30,6 +30,7 @@
msgstr "#legend blockquote:before { content: \"Code for the left border\"; }\n"
#. type: Content of: <style>
+#, no-wrap
msgid ""
"#legend dl.green dt:after {\n"
" content: \"Free licenses, compatible with the GNU GPL or FDL\";\n"
@@ -40,6 +41,7 @@
"}\n"
#. type: Content of: <style>
+#, no-wrap
msgid ""
"#legend dl.orange dt:after {\n"
" content: \"Free licenses, incompatible with the GNU GPL and FDL\";\n"
@@ -3120,13 +3122,13 @@
"some countries, users that download code with no license may infringe "
"copyright merely by compiling it or running it."
msgstr ""
-"ä½äººãã®éçºè
ã¯ãã©ã¤ã»ã³ã¹ããªãã³ã¼ãã¯<a
href=\"#PublicDomain"
-"\">ãããªãã¯ã»ãã¡ã¤ã³</a>ã ã¨èãã¾ãã"
-"ä»æ¥ã®èä½æ¨©æ³ã§ã¯ãããã¯äºå®ã§ã¯ããã¾ãããããããæå®ããªããã°ããã¹ã¦"
-"ã®èä½ç©ã«ã¯èä½æ¨©ãããã¾ããããã«ã¯ããã°ã©ã
ãå«ã¾ãã¾ãã"
-"ã¦ã¼ã¶ã«èªç±ãä¸ããã©ã¤ã»ã³ã¹ããªãå
´åããã®ããã°ã©ã ã«ã¯ãªãã®èªç±ãããã¾ããã"
-"ããå½ã
ã§ã¯ãã©ã¤ã»ã³ã¹ãªãã®ã³ã¼ãããã¦ã³ãã¼ãããã¦ã¼ã¶ããåã«ã³ã³ãã¤ã«ãããã¯å®è¡ããã
ã"
-"ã§èä½æ¨©ã«éåãããã¨ããããã¾ãã"
+"ä½äººãã®éçºè
ã¯ãã©ã¤ã»ã³ã¹ããªãã³ã¼ãã¯<a
href=\"#PublicDomain\">ãããªã"
+"ã¯ã»ãã¡ã¤ã³</a>ã
ã¨èãã¾ããä»æ¥ã®èä½æ¨©æ³ã§ã¯ãããã¯äºå®ã§ã¯ããã¾ããã"
+"ããããæå®ããªããã°ããã¹ã¦ã®èä½ç©ã«ã¯èä½æ¨©ãããã¾ããããã«ã¯ããã°ã©"
+"ã
ãå«ã¾ãã¾ããã¦ã¼ã¶ã«èªç±ãä¸ããã©ã¤ã»ã³ã¹ããªãå
´åããã®ããã°ã©ã ã«ã¯"
+"ãªãã®èªç±ãããã¾ãããããå½ã
ã§ã¯ãã©ã¤ã»ã³ã¹ãªãã®ã³ã¼ãããã¦ã³ãã¼ãã"
+"ãã¦ã¼ã¶ããåã«ã³ã³ãã¤ã«ãããã¯å®è¡ããã
ãã§èä½æ¨©ã«éåãããã¨ãããã"
+"ã¾ãã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3148,11 +3150,11 @@
"apply to other countries, many of which do allow the state to have a "
"copyright on government writings."
msgstr ""
-"åè¡å½èä½æ¨©æ³ã¯ãæ示çã«ããããããªãã¯ãã¡ã¤ã³ã«ããã®ã§ã"
-"åè¡å½æ¿åºã®éç¨ããè
ã«ãã£ã¦æ¸ãããã³ã¼ãã¯ç¹å¥ãªä¾å¤ã§ãã"
-"ããããããã¯åè¡å½ãããä¼ç¤¾ã«æ¸ããã¨ã«ã¤ãã¦æ¯æã£ãå
´åã®ä½åã«ã¯é©ç¨ããã¾ããã"
-"ã¾ãããã®ä»ã®å½ã
ã«ãé©ç¨ããã¾ãããå¤ãã®å½ã§ã¯ãæ¿åºã®èä½ç©ã«èä½æ¨©ãæãããã¨ã"
-"èªãã¦ãã¾ãã"
+"åè¡å½èä½æ¨©æ³ã¯ãæ示çã«ããããããªãã¯ãã¡ã¤ã³ã«ããã®ã§ãåè¡å½æ¿åºã®é"
+"ç¨ããè
ã«ãã£ã¦æ¸ãããã³ã¼ãã¯ç¹å¥ãªä¾å¤ã§ããããããããã¯åè¡å½ãããä¼"
+"社ã«æ¸ããã¨ã«ã¤ãã¦æ¯æã£ãå
´åã®ä½åã«ã¯é©ç¨ããã¾ãããã¾ãããã®ä»ã®å½ã
"
+"ã«ãé©ç¨ããã¾ãããå¤ãã®å½ã§ã¯ãæ¿åºã®èä½ç©ã«èä½æ¨©ãæãããã¨ãèªãã¦ã"
+"ã¾ãã"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3383,8 +3385,8 @@
"(<a href=\"#DOR\">#DOR</a>)</span>"
msgstr ""
"<a id=\"DOR\" href=\"http://dorepository.org/download.html\"> CNRI
ãã£ã¸ã¿ã«"
-"ãªãã¸ã§ã¯ã ãªãã¸ã㪠ã©ã¤ã»ã³ã¹åæ</a> <span
class=\"anchor-reference-id\"> "
-"(<a href=\"#DOR\">#DOR</a>)</span>"
+"ãªãã¸ã§ã¯ã ãªãã¸ã㪠ã©ã¤ã»ã³ã¹åæ</a> <span
class=\"anchor-reference-id"
+"\"> (<a href=\"#DOR\">#DOR</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3392,9 +3394,9 @@
"requirement not to violate the license of <em>any</em> program that the user "
"runs—even proprietary programs."
msgstr ""
-"ãã®ã©ã¤ã»ã³ã¹ã¯ããã®ç¬¬ä¸é
ãããããã"
-"ãã®ã¦ã¼ã¶ãå®è¡ãã<em>ãããªã</em>ããã°ã©ã
(ãããã©ã¤ã¨ã¿ãªã®ããã°ã©ã ã§ããã)ã®ã©ã¤ã»ã³ã¹"
-"ã«ãéåããªããã¨ã®è¦æ±ãå«ãã§ããããä¸èªç±ã§ãã"
+"ãã®ã©ã¤ã»ã³ã¹ã¯ããã®ç¬¬ä¸é
ãããããããã®ã¦ã¼ã¶ãå®è¡ãã<em>ãããªã</em>"
+"ããã°ã©ã (ãããã©ã¤ã¨ã¿ãªã®ããã°ã©ã
ã§ããã)ã®ã©ã¤ã»ã³ã¹ã«ãéåããªãã"
+"ã¨ã®è¦æ±ãå«ãã§ããããä¸èªç±ã§ãã"
#. type: Content of: <dl><dt>
msgid ""
@@ -4523,8 +4525,7 @@
#. type: Content of: <div><h4>
msgid "Licenses for Works stating a Viewpoint (e.g., Opinion or Testimony)"
-msgstr ""
-"è¦è§£ã示ãä½åã®ã©ã¤ã»ã³ã¹ (ä¾ãæè¦ãæ¨è¦æ)"
+msgstr "è¦è§£ã示ãä½åã®ã©ã¤ã»ã³ã¹ (ä¾ãæè¦ãæ¨è¦æ)"
#. type: Content of: <div>
msgid ""
@@ -4611,8 +4612,8 @@
msgid ""
"<strong><a href=\"/licenses/licenses.html\">More about licenses</a></strong>"
msgstr ""
-"<strong><a
href=\"/licenses/licenses.html\">ã©ã¤ã»ã³ã¹ã«ã¤ãã¦ãããªãæ
å ±"
-"</a></strong>"
+"<strong><a
href=\"/licenses/licenses.html\">ã©ã¤ã»ã³ã¹ã«ã¤ãã¦ãããªãæ
å
±</"
+"a></strong>"
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
Index: philosophy/proprietary.ru.html
===================================================================
RCS file: /web/www/www/philosophy/proprietary.ru.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/proprietary.ru.html 14 Apr 2014 07:08:09 -0000 1.7
+++ philosophy/proprietary.ru.html 28 Apr 2014 08:28:06 -0000 1.8
@@ -57,8 +57,8 @@
“ÑанкÑиониÑованнÑÑ
”
пÑоизводиÑелем.</li>
</ul>
-<p>ÐеÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ ÑаÑÑо вÑедоноÑнÑ.
ÐекоÑоÑÑе из пÑиведеннÑÑ
вÑÑе
-Ñведений ÑпоÑÑдоÑÐµÐ½Ñ Ð¿Ð¾ ÑиÑÑемам и
компаниÑм, пÑогÑÐ°Ð¼Ð¼Ñ ÐºÐ¾ÑоÑÑÑ
вÑедоноÑнÑ:</p>
+<p>Ðа ÑледÑÑÑиÑ
ÑÑÑаниÑаÑ
пÑедÑÑавленÑ
пÑимеÑÑ, ÑаÑположеннÑе по конкÑеÑнÑм
+компаниÑм или ÑиÑÑемам:</p>
<ul>
<li><a href="/philosophy/malware-apple.html"> ÐÑогÑÐ°Ð¼Ð¼Ñ Apple
вÑедоноÑнÑ</a></li>
@@ -67,14 +67,15 @@
<li><a href="/philosophy/malware-mobiles.html">ÐÑедоноÑнÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð² мобилÑнÑÑ
ÑÑÑÑойÑÑваÑ
</a></li>
<li><a href="/philosophy/malware-kindle-swindle.html">ÐÑедоноÑнÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð²
-надÑваÑелÑÑÑве-Kindle</a></li>
+надÑваÑелÑÑÑве Amazon</a></li>
</ul>
-<p>ÐзбежаÑÑ Ð·Ð»Ð¾ÑпоÑÑеблений ÑÑого Ñода
можно, наÑÑÐ°Ð¸Ð²Ð°Ñ Ð½Ð° <a
+<p>ÐолÑзоваÑели неÑвободнÑÑ
пÑогÑамм
беззаÑиÑÐ½Ñ Ð¿ÐµÑед Ñакого Ñода
+неÑпÑаведливоÑÑÑми. ÐзбежаÑÑ Ð¸Ñ
можно,
наÑÑÐ°Ð¸Ð²Ð°Ñ Ð½Ð° <a
href="/philosophy/free-software-even-more-important.html"> ÑвободнÑÑ
(ÑважаÑÑиÑ
ÑвободÑ) пÑогÑаммаÑ
</a>.
ÐоÑколÑÐºÑ ÑвободнÑе пÑогÑаммÑ
конÑÑолиÑÑÑÑÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑми, они
доволÑно Ñ
оÑоÑо заÑиÑÐµÐ½Ñ Ð¾Ñ Ð²ÑедоноÑной
-ÑÑнкÑионалÑноÑÑи. ÐолÑзоваÑели
неÑвободнÑÑ
пÑогÑамм беззаÑиÑнÑ.</p>
+ÑÑнкÑионалÑноÑÑи.</p>
<div class="translators-notes">
@@ -153,7 +154,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/04/14 07:08:09 $
+$Date: 2014/04/28 08:28:06 $
<!-- timestamp end -->
</p>
Index: philosophy/po/proprietary.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary.ru-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/proprietary.ru-en.html 14 Apr 2014 07:08:09 -0000
1.8
+++ philosophy/po/proprietary.ru-en.html 28 Apr 2014 08:28:06 -0000
1.9
@@ -47,24 +47,24 @@
manufacturer.</li>
</ul>
-<p>Proprietary software is often malware. Some of the information above is
-organized by systems or companies whose software is malware:</p>
+<p>These pages present some of the same examples, organized by
+specific companies or systems:</p>
<ul>
<li><a href="/philosophy/malware-apple.html">Apple's software is
malware</a></li>
<li><a href="/philosophy/malware-microsoft.html">Microsoft's software is
malware</a></li>
<li><a href="/philosophy/malware-mobiles.html">Malware in mobile
devices</a></li>
- <li><a href="/philosophy/malware-kindle-swindle.html">Malware in the Kindle
+ <li><a href="/philosophy/malware-kindle-swindle.html">Malware in the Amazon
Swindle</a></li>
</ul>
-<p>The way to avoid these forms of abuse is by insisting on
+<p>Users of proprietary software are defenseless against these forms
+of mistreatment. The way to avoid them is by insisting on
<a href="/philosophy/free-software-even-more-important.html">free
(freedom-respecting) software.</a> Since free software is controlled
by its users, they have a pretty good defense against malicious
-software functionality. Users of proprietary software are
-defenseless.</p>
+software functionality.</p>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -123,7 +123,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/14 07:08:09 $
+$Date: 2014/04/28 08:28:06 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/proprietary.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary.ru.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/proprietary.ru.po 28 Apr 2014 07:40:56 -0000 1.19
+++ philosophy/po/proprietary.ru.po 28 Apr 2014 08:28:06 -0000 1.20
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2014-04-25 20:55+0000\n"
#. type: Content of: <title>
msgid "Proprietary Software - GNU Project - Free Software Foundation"
@@ -168,11 +167,6 @@
"мобилÑнÑÑ
ÑÑÑÑойÑÑваÑ
</a>"
#. type: Content of: <ul><li>
-# | <a href=\"/philosophy/malware-kindle-swindle.html\">Malware in the
-# | [-Kindle-] {+Amazon+} Swindle</a>
-#| msgid ""
-#| "<a href=\"/philosophy/malware-kindle-swindle.html\">Malware in the Kindle "
-#| "Swindle</a>"
msgid ""
"<a href=\"/philosophy/malware-kindle-swindle.html\">Malware in the Amazon "
"Swindle</a>"
@@ -181,19 +175,6 @@
"надÑваÑелÑÑÑве Amazon</a>"
#. type: Content of: <p>
-# | {+Users of proprietary software are defenseless against these forms of
-# | mistreatment.+} The way to avoid [-these forms of abuse-] {+them+} is by
-# | insisting on <a
-# | href=\"/philosophy/free-software-even-more-important.html\">free
-# | (freedom-respecting) software.</a> Since free software is controlled by
-# | its users, they have a pretty good defense against malicious software
-# | functionality. [-Users of proprietary software are defenseless.-]
-#| msgid ""
-#| "The way to avoid these forms of abuse is by insisting on <a href=\"/"
-#| "philosophy/free-software-even-more-important.html\">free (freedom-"
-#| "respecting) software.</a> Since free software is controlled by its users, "
-#| "they have a pretty good defense against malicious software "
-#| "functionality. Users of proprietary software are defenseless."
msgid ""
"Users of proprietary software are defenseless against these forms of "
"mistreatment. The way to avoid them is by insisting on <a href=\"/"
@@ -201,12 +182,11 @@
"respecting) software.</a> Since free software is controlled by its users, "
"they have a pretty good defense against malicious software functionality."
msgstr ""
-"ÐолÑзоваÑели неÑвободнÑÑ
пÑогÑамм
беззаÑиÑÐ½Ñ Ð¿ÐµÑед Ñакого Ñода
неÑпÑаведливоÑÑÑми. "
-"ÐзбежаÑÑ Ð¸Ñ
можно, наÑÑÐ°Ð¸Ð²Ð°Ñ Ð½Ð° <a href=\"/"
-"philosophy/free-software-even-more-important.html\"> ÑвободнÑÑ
(ÑважаÑÑиÑ
"
-"ÑвободÑ) пÑогÑаммаÑ
</a>. ÐоÑколÑкÑ
ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ ÐºÐ¾Ð½ÑÑолиÑÑÑÑÑÑ "
-"полÑзоваÑелÑми, они доволÑно Ñ
оÑоÑо
заÑиÑÐµÐ½Ñ Ð¾Ñ Ð²ÑедоноÑной "
-"ÑÑнкÑионалÑноÑÑи."
+"ÐолÑзоваÑели неÑвободнÑÑ
пÑогÑамм
беззаÑиÑÐ½Ñ Ð¿ÐµÑед Ñакого Ñода "
+"неÑпÑаведливоÑÑÑми. ÐзбежаÑÑ Ð¸Ñ
можно,
наÑÑÐ°Ð¸Ð²Ð°Ñ Ð½Ð° <a href=\"/philosophy/"
+"free-software-even-more-important.html\"> ÑвободнÑÑ
(ÑважаÑÑиÑ
ÑвободÑ) "
+"пÑогÑаммаÑ
</a>. ÐоÑколÑÐºÑ ÑвободнÑе
пÑогÑÐ°Ð¼Ð¼Ñ ÐºÐ¾Ð½ÑÑолиÑÑÑÑÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑми, "
+"они доволÑно Ñ
оÑоÑо заÑиÑÐµÐ½Ñ Ð¾Ñ
вÑедоноÑной ÑÑнкÑионалÑноÑÑи."
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.