www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www distros/common-distros.ja.html distros/free...


From: GNUN
Subject: www distros/common-distros.ja.html distros/free...
Date: Tue, 15 May 2012 08:28:48 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/05/15 08:28:48

Modified files:
        distros        : common-distros.ja.html free-distros.ja.html 
        distros/po     : common-distros.ja-en.html common-distros.ja.po 
                         free-distros.ja-en.html free-distros.ja.po 
        education      : education.it.html education.ja.html 
        education/po   : education.it-en.html education.it.po 
                         education.ja-en.html education.ja.po 
        philosophy/po  : essays-and-articles.ja.po 
        server         : sitemap.ja.html 
        server/po      : sitemap.ja-en.html sitemap.ja.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.ja.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.ja.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ja-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.ja.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.it.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.ja.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.it-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.it.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ja-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ja.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ja.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.ja.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ja-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ja.po?cvsroot=www&r1=1.44&r2=1.45

Patches:
Index: distros/common-distros.ja.html
===================================================================
RCS file: /web/www/www/distros/common-distros.ja.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- distros/common-distros.ja.html      23 Apr 2012 08:27:19 -0000      1.6
+++ distros/common-distros.ja.html      15 May 2012 08:27:02 -0000      1.7
@@ -110,7 +110,7 @@
 
 <p>FreeBSD、NetBSD、そしてOpenBSDとすべてが、portsシステム
で不自由なプログラムを入手する手順を示しています。加
えて、これらのカーネルには不自由なファーム
ウェア・ブロブを含みます。</p>
 
-<p>カーネル、Linuxで使われる不自由なファーム
ウェア・プログラム
は「ブロブ」と呼ばれ、これがわたしたちが使う用語です。BSDの語法では、「ブロブ」という用語は別のもの、不自由なドライバを指します。OpenBSDとおそらくは他のBSDディストリビューションは、これらを含まないというポリシーを持っています。ドライバについてこれは正しいポリシーです。しかし、開発è€
…
が、「ブロブは一つもありません」、と言うときには、誤解を生みます。かれらは、ファーãƒ
 ã‚¦ã‚§ã‚¢ãƒ»ãƒ–ロブについて言ってるのではないのです。</p>
+<p>カーネル、Linuxで使われる不自由なファーム
ウェア・プログラム
は「ブロブ」と呼ばれ、これがわたしたちが使う用語です。BSDの語法では、「ブロブ」という用語は別のもの、不自由なドライバを指します。OpenBSDとおそらくは他のBSDディストリビューション(BSD開発è€
…
は「プロジェクト」と呼びます)は、これを含まないというポリシーを持っています。ドライバについてこれは正しいポリシーです。しかし、開発è€
…
が、「ブロブは一つもありません」、と言うときには、誤解を生みます。かれらは、ファーãƒ
 ã‚¦ã‚§ã‚¢ãƒ»ãƒ–ロブについて言ってるのではないのです。</p>
 
 
<p>どのBSDディストリビューションもプロプライエタリなバイナリã
 ã‘のファーム
ウェアに反対するポリシーを持っていません。自由なドライバでさえ、それをロードするかもしれないのに。</p>
 
@@ -160,56 +160,11 @@
 <!-- timestamp start -->
 最終更新:
 
-$Date: 2012/04/23 08:27:19 $
+$Date: 2012/05/15 08:27:02 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- <div id="translations">
- -->
-<!-- <h4>
-Translations of this page</h4> -->
-<!--  -->
-<!-- Please keep this list alphabetical by language code. -->
-<!--      Comment what the language is for each type, i.e. de is German. -->
-<!--      Write the language name in its own language (Deutsch) in the text. 
-->
-<!--      If you add a new language here, please -->
-<!--      advise address@hidden and add it to -->
-<!--       - /home/www/html/server/standards/README.translations.html -->
-<!--       - one of the lists under the section "Translations Underway" -->
-<!--       - if there is a translation team, you also have to add an alias -->
-<!--       to mail.gnu.org:/com/mailer/aliases -->
-<!--      Please also check you have the language code right; see: -->
-<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!--      If the 2-letter ISO 639-1 code is not available, -->
-<!--      use the 3-letter ISO 639-2. -->
-<!--      Please use W3C normative character entities. -->
-<!--  -->
-<!-- <ul class="translations-list">
- -->
-<!-- German -->
-<!-- <li>
-<a href="/distros/common-distros.de.html">Deutsch</a>&nbsp;[de]</li> -->
-<!-- English -->
-<!-- <li>
-<a href="/distros/common-distros.html">English</a>&nbsp;[en]</li> -->
-<!-- Spanish -->
-<!-- <li>
-<a href="/distros/common-distros.es.html">espa&ntilde;ol</a>&nbsp;[es]</li> -->
-<!-- Italian -->
-<!-- <li>
-<a href="/distros/common-distros.it.html">italiano</a>&nbsp;[it]</li> -->
-<!-- Polish -->
-<!-- <li>
-<a href="/distros/common-distros.pl.html">polski</a>&nbsp;[pl]</li> -->
-<!-- Russian -->
-<!-- <li>
-<a 
href="/distros/common-distros.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
-<!-- </ul>
- -->
-<!-- </div>
- -->
 </div>
 </body>
 </html>

Index: distros/free-distros.ja.html
===================================================================
RCS file: /web/www/www/distros/free-distros.ja.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- distros/free-distros.ja.html        29 Apr 2012 08:27:46 -0000      1.8
+++ distros/free-distros.ja.html        15 May 2012 08:27:03 -0000      1.9
@@ -64,9 +64,9 @@
    <td>Parabola GNU/Linux, 
Archをもととしシンプルなパッケージとシステム管理を優å…
ˆã—たディストリビューション</td></tr>
 
  <tr class="odd">
-   <td><a href="http://trisquel.info/en";>
+   <td><a href="http://trisquel.info/";>
        <img src="/graphics/distros-trisquel.png" alt="Trisquel" /></a></td>
-   <td>Trisquel, 小さな企業、地域の利用者
、教育センターを指向したGNU/Linuxディストリビューション</td></tr>
+   <td>Trisquel, Ubuntuを元にした、小さな企業、地域の利用者
、教育センターを指向したGNU/Linuxディストリビューション</td></tr>
 
  <tr class="even">
    <td><a href="http://www.ututo.org/";>
@@ -141,7 +141,7 @@
  <p><!-- timestamp start -->
 最終更新:
 
-$Date: 2012/04/29 08:27:46 $
+$Date: 2012/05/15 08:27:03 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/common-distros.ja-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- distros/po/common-distros.ja-en.html        23 Apr 2012 08:27:39 -0000      
1.6
+++ distros/po/common-distros.ja-en.html        15 May 2012 08:27:16 -0000      
1.7
@@ -175,11 +175,11 @@
 <p>Nonfree firmware programs used with Linux, the kernel, are called
 &ldquo;blobs&rdquo;, and that's how we use the term.  In BSD parlance,
 the term &ldquo;blob&rdquo; means something else: a nonfree driver.
-OpenBSD and perhaps other BSD distributions have the policy of not
-including those.  That is the right policy, as regards drivers; but
-when the developers say these distributions &ldquo;contain no
-blobs&rdquo;, it causes a misunderstanding.  They are not talking
-about firmware blobs.</p>
+OpenBSD and perhaps other BSD distributions (called &ldquo;projects&rdquo; by 
BSD
+developers) have the policy of not including those.  That is the right 
+policy, as regards drivers; but when the developers say these distributions 
+&ldquo;contain no blobs&rdquo;, it causes a misunderstanding.  They are not 
+talking about firmware blobs.</p>
 
 <p>No BSD distribution has policies against proprietary binary-only
 firmware that might be loaded even by free drivers.</p>
@@ -221,44 +221,10 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/04/23 08:27:39 $
+$Date: 2012/05/15 08:27:16 $
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- <div id="translations"> -->
-<!-- <h4>Translations of this page</h4> -->
-<!--  -->
-<!-- Please keep this list alphabetical by language code. -->
-<!--      Comment what the language is for each type, i.e. de is German. -->
-<!--      Write the language name in its own language (Deutsch) in the text. 
-->
-<!--      If you add a new language here, please -->
-<!--      advise address@hidden and add it to -->
-<!--       - /home/www/html/server/standards/README.translations.html -->
-<!--       - one of the lists under the section "Translations Underway" -->
-<!--       - if there is a translation team, you also have to add an alias -->
-<!--       to mail.gnu.org:/com/mailer/aliases -->
-<!--      Please also check you have the language code right; see: -->
-<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!--      If the 2-letter ISO 639-1 code is not available, -->
-<!--      use the 3-letter ISO 639-2. -->
-<!--      Please use W3C normative character entities. -->
-<!--  -->
-<!-- <ul class="translations-list"> -->
-<!-- German -->
-<!-- <li><a href="/distros/common-distros.de.html">Deutsch</a>&nbsp;[de]</li> 
-->
-<!-- English -->
-<!-- <li><a href="/distros/common-distros.html">English</a>&nbsp;[en]</li> -->
-<!-- Spanish -->
-<!-- <li><a 
href="/distros/common-distros.es.html">espa&ntilde;ol</a>&nbsp;[es]</li> -->
-<!-- Italian -->
-<!-- <li><a href="/distros/common-distros.it.html">italiano</a>&nbsp;[it]</li> 
-->
-<!-- Polish -->
-<!-- <li><a href="/distros/common-distros.pl.html">polski</a>&nbsp;[pl]</li> 
-->
-<!-- Russian -->
-<!-- <li><a 
href="/distros/common-distros.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
 -->
-<!-- </ul> -->
-<!-- </div> -->
 </div>
 </body>
 </html>

Index: distros/po/common-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- distros/po/common-distros.ja.po     15 May 2012 06:12:52 -0000      1.20
+++ distros/po/common-distros.ja.po     15 May 2012 08:27:19 -0000      1.21
@@ -381,9 +381,9 @@
 
"れ、これがわたしたちが使う用語です。BSDの語法では、「ブロブ」という用語は別の"
 
"もの、不自由なドライバを指します。OpenBSDとおそらくは他のBSDディストリビュー"
 "ション(BSD開発者
は「プロジェクト」と呼びます)は、これを含まないというポリシー"
-"を持っています。ドライバについてこれは正しいポリシーです。しかし、開発è€
…が、「"
-"ブロブは一つもありません」、と言うときには、誤解を生みます。かれらは、ファーãƒ
 "
-"ウェア・ブロブについて言ってるのではないのです。"
+"を持っています。ドライバについてこれは正しいポリシーです。しかし、開発è€
…が、"
+"「ブロブは一つもありません」、と言うときには、誤解を生みます。かれらは、"
+"ファーム
ウェア・ブロブについて言ってるのではないのです。"
 
 #. type: Content of: <p>
 msgid ""

Index: distros/po/free-distros.ja-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ja-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- distros/po/free-distros.ja-en.html  29 Apr 2012 08:28:03 -0000      1.8
+++ distros/po/free-distros.ja-en.html  15 May 2012 08:27:20 -0000      1.9
@@ -79,10 +79,10 @@
        prioritizes simple package and system management.</td></tr>
 
  <tr class="odd">
-   <td><a href="http://trisquel.info/en";>
+   <td><a href="http://trisquel.info/";>
        <img src="/graphics/distros-trisquel.png" alt="Trisquel" /></a></td>
-   <td>Trisquel, a GNU/Linux distribution oriented toward small enterprises,
-       domestic users and educational centers.</td></tr>
+   <td>Trisquel, a GNU/Linux distribution based on Ubuntu that's oriented 
+ toward small enterprises, domestic users and educational centers.</td></tr>
 
  <tr class="even">
    <td><a href="http://www.ututo.org/";>
@@ -162,7 +162,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/04/29 08:28:03 $
+$Date: 2012/05/15 08:27:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/free-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.ja.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- distros/po/free-distros.ja.po       15 May 2012 06:12:52 -0000      1.17
+++ distros/po/free-distros.ja.po       15 May 2012 08:27:20 -0000      1.18
@@ -192,8 +192,8 @@
 "Trisquel, a GNU/Linux distribution based on Ubuntu that's oriented toward "
 "small enterprises, domestic users and educational centers."
 msgstr ""
-"Trisquel, Ubuntuを元にした、小さな企業、地域の利用者
、教育センターを"
-"指向したGNU/Linuxディストリビューション"
+"Trisquel, Ubuntuを元にした、小さな企業、地域の利用者
、教育センターを指向した"
+"GNU/Linuxディストリビューション"
 
 #. type: Content of: <table><tr><td><a>
 msgid "<a href=\"http://www.ututo.org/\";>"

Index: education/education.it.html
===================================================================
RCS file: /web/www/www/education/education.it.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- education/education.it.html 14 May 2012 16:28:44 -0000      1.11
+++ education/education.it.html 15 May 2012 08:27:34 -0000      1.12
@@ -103,7 +103,7 @@
 <!-- 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";>
+<a href="http://audio-video.gnu.org/video/rms-education-es-high-sub.it.ogv";>
 Scarica e guarda il video</a> ad alta risoluzione nel formato libero Ogg
 Theora (ogv).</p>
 
@@ -180,7 +180,7 @@
  <p><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2012/05/14 16:28:44 $
+$Date: 2012/05/15 08:27:34 $
 
 <!-- timestamp end -->
 </p>

Index: education/education.ja.html
===================================================================
RCS file: /web/www/www/education/education.ja.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- education/education.ja.html 17 Feb 2012 01:26:04 -0000      1.2
+++ education/education.ja.html 15 May 2012 08:27:34 -0000      1.3
@@ -25,7 +25,8 @@
 </div> 
 
 <!-- id="education-content" -->
-<div style="text-align: center; margin-top: 0.5em; margin-bottom: 0.5em; 
background-color: #fcc76f; color: #000000; padding: 
0.5em;">自由な教育向けゲームの開発者
や教育を目的として利用できる自由なゲームの情å 
±ã‚’探しています。<a
+<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";>&lt;address@hidden&gt;</a>まで連絡くだ
さい。</div>
                
 <div class="center">
@@ -50,28 +51,39 @@
 
href="http://www.fsf.org/about/leadership/#rms";>リチャード・ストールマン</a>が自由ソフトウェアの原則について要点を説明し、この原則が教育とどのように関係するのかを説明しています。</p>
 
 <p>
-<!-- TRANSLATORS: please add the link to your language here in the first 
place, followed by a comma. -->
+<!-- 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">その他の言語</a>で読むことができます。
 
 </p>
 
-<p> <!-- TRANSLATORS: please add the link to your language here in the first 
place, followed by a comma. -->
+<p>
+
+<!-- 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">その他の言語</a>でダウンロードもできます。
 
 </p>
 
+<!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video id="rms-movie" width="512" height="288" controls="controls">
   <source
-    src="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv"; 
+    src="/education/rms-education-es.ogv"
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
                                
-<p>ビデオを<a 
href="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv";>
-Ogg Theora</a>形式でダウンロードする。</p>
+<p>
+
+<!-- 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-sub-en.ogv";>ダウンロードしてビデオをみる。</a>
+(Ogg Theora (ogv) 自由フォーマット)</p>
 
 <p>GNUプロジェクトは、自由オペレーティングシステム
:GNUオペレーティングシステム
、を開発するために、リチャード・ストールマンによって1983年に<a
 href="
@@ -136,51 +148,11 @@
  <p><!-- timestamp start -->
 最終更新:
 
-$Date: 2012/02/17 01:26:04 $
+$Date: 2012/05/15 08:27:34 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- <div id="translations">
- -->
-<!-- <h4>
-Translations of this page</h4> -->
-<!--  -->
-<!-- Please keep this list alphabetical by language code. -->
-<!--      Comment what the language is for each type, i.e. de is German. -->
-<!--      Write the language name in its own language (Deutsch) in the text. 
-->
-<!--      If you add a new language here, please -->
-<!--      advise address@hidden and add it to -->
-<!--       - /home/www/html/server/standards/README.translations.html -->
-<!--       - one of the lists under the section "Translations Underway" -->
-<!--       - if there is a translation team, you also have to add an alias -->
-<!--       to mail.gnu.org:/com/mailer/aliases -->
-<!--      Please also check you have the language code right; see: -->
-<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!--      If the 2-letter ISO 639-1 code is not available, -->
-<!--      use the 3-letter ISO 639-2. -->
-<!--      Please use W3C normative character entities. -->
-<!--  -->
-<!--      See also '(web-trans)Capitalization': -->
-<!--      
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-<!--      -->
-<!--  -->
-<!-- <ul class="translations-list">
- -->
-<!-- German -->
-<!-- <li>
-<a href="/education/education.de.html">Deutsch</a>&nbsp;[de]</li> -->
-<!-- English -->
-<!-- <li>
-<a href="/education/education.html">English</a>&nbsp;[en]</li> -->
-<!-- Spanish -->
-<!-- <li>
-<a href="/education/education.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
-<!-- </ul>
- -->
-<!-- </div>
- -->
 </div>
 </body>
 </html>

Index: education/po/education.it-en.html
===================================================================
RCS file: /web/www/www/education/po/education.it-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- education/po/education.it-en.html   14 May 2012 16:29:07 -0000      1.8
+++ education/po/education.it-en.html   15 May 2012 08:27:48 -0000      1.9
@@ -164,7 +164,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/05/14 16:29:07 $
+$Date: 2012/05/15 08:27:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education/po/education.it.po
===================================================================
RCS file: /web/www/www/education/po/education.it.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20

Index: education/po/education.ja-en.html
===================================================================
RCS file: /web/www/www/education/po/education.ja-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- education/po/education.ja-en.html   17 Feb 2012 01:26:19 -0000      1.2
+++ education/po/education.ja-en.html   15 May 2012 08:27:48 -0000      1.3
@@ -1,7 +1,9 @@
 <!--#include virtual="/server/html5-header.html" -->
 <!-- Parent-Version: 1.57 -->
+
 <title>Free Software and Education - GNU Project - Free Software 
 Foundation</title>
+
 <!--#include virtual="/server/banner.html" -->
 <!--#include virtual="/education/po/education.translist" -->
 
@@ -21,7 +23,11 @@
 
 </div> <!-- id="education-content" -->
 
-<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 
developers of free educational games, or information about free games that can 
be used for educational purposes. Contact <a 
href="mailto:address@hidden";>&lt;address@hidden&gt;</a></div>
+<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 developers of free educational games, or information about 
+free games that can be used for educational purposes. Contact <a 
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a></div>
                
 <div class="center">
 
@@ -64,30 +70,41 @@
 
 <p>
 Transcriptions of this video are available in
-<!-- TRANSLATORS: please add the link to your language here in the first 
place, followed by a comma. -->
+<!-- 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">English</a>, 
 <a href="/education/misc/rms-education-es-transcription.txt">Spanish</a>, and 
 <a href="/education/misc/edu-misc.html#transcriptions">other languages</a>. 
 </p>
 
-<p> SubRip subtitle files are also available for download in
-<!-- TRANSLATORS: please add the link to your language here in the first 
place, followed by a comma. --> 
+<p> 
+<!-- TRANSLATORS: please add the link to your language here in the first 
+     place, followed by a comma. --> 
 
+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">other languages</a>. 
 </p>
 
+<!-- GNUN: localize URL /education/rms-education-es.ogv -->
+
 <video id="rms-movie" width="512" height="288" controls="controls">
   <source
-    src="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv"; 
+    src="/education/rms-education-es.ogv"
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
                                
-<p>Download video as 
-<a href="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv";>
-Ogg Theora</a>.</p>
+<p>
+<!-- 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 
@@ -147,42 +164,10 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/17 01:26:19 $
+$Date: 2012/05/15 08:27:48 $
 <!-- timestamp end -->
 </p>
 </div>
-
-<!-- <div id="translations"> -->
-<!-- <h4>Translations of this page</h4> -->
-<!--  -->
-<!-- Please keep this list alphabetical by language code. -->
-<!--      Comment what the language is for each type, i.e. de is German. -->
-<!--      Write the language name in its own language (Deutsch) in the text. 
-->
-<!--      If you add a new language here, please -->
-<!--      advise address@hidden and add it to -->
-<!--       - /home/www/html/server/standards/README.translations.html -->
-<!--       - one of the lists under the section "Translations Underway" -->
-<!--       - if there is a translation team, you also have to add an alias -->
-<!--       to mail.gnu.org:/com/mailer/aliases -->
-<!--      Please also check you have the language code right; see: -->
-<!--      http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!--      If the 2-letter ISO 639-1 code is not available, -->
-<!--      use the 3-letter ISO 639-2. -->
-<!--      Please use W3C normative character entities. -->
-<!--  -->
-<!--      See also '(web-trans)Capitalization': -->
-<!--      
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
 -->
-<!--      -->
-<!--  -->
-<!-- <ul class="translations-list"> -->
-<!-- German -->
-<!-- <li><a href="/education/education.de.html">Deutsch</a>&nbsp;[de]</li> -->
-<!-- English -->
-<!-- <li><a href="/education/education.html">English</a>&nbsp;[en]</li> -->
-<!-- Spanish -->
-<!-- <li><a 
href="/education/education.es.html">espa&#x00f1;ol</a>&nbsp;[es]</li> -->
-<!-- </ul> -->
-<!-- </div> -->
 </div>
 </body>
 </html>

Index: education/po/education.ja.po
===================================================================
RCS file: /web/www/www/education/po/education.ja.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- education/po/education.ja.po        15 May 2012 06:13:50 -0000      1.5
+++ education/po/education.ja.po        15 May 2012 08:27:48 -0000      1.6
@@ -159,8 +159,8 @@
 "\"> Download and watch the video</a> at a higher definition in the Ogg "
 "Theora (ogv) free format."
 msgstr ""
-"<a href=\"http://audio-video.gnu.org/video/rms-education-es-sub-en.";
-"ogv\">ダウンロードしてビデオをみる。</a> (Ogg Theora (ogv) 
自由フォーマット)"
+"<a 
href=\"http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv\";>ダウ"
+"ンロードしてビデオをみる。</a> (Ogg Theora (ogv) 
自由フォーマット)"
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: philosophy/po/essays-and-articles.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ja.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- philosophy/po/essays-and-articles.ja.po     15 May 2012 06:13:05 -0000      
1.22
+++ philosophy/po/essays-and-articles.ja.po     15 May 2012 08:28:05 -0000      
1.23
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-05-08 20:26-0300\n"
 
 #. type: Content of: <title>
 msgid "Essays and Articles - GNU Project - Free Software Foundation (FSF)"
@@ -665,12 +666,13 @@
 "\"http://www.stallman.org\";>リチャード・ストールマン</a>著"
 
 #. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/philosophy/fs-motives.html\">Motives For Writing Free "
+#| "Software</a>"
 msgid ""
 "<a href=\"/philosophy/ebooks-must-increase-freedom.html\"> Ebooks must "
 "increase our freedom, not decrease it</a>"
-"<a href=\"/philosophy/ebooks-must-increase-freedom.html\"> Ebooksは"
-"わたしたちの自由を増やすべきであり、減じてはならない</a>"
-
 msgstr "<a 
href=\"/philosophy/fs-motives.html\">自由ソフトウェアを書く動機</a>"
 
 #. type: Content of: <ul><li>
@@ -1209,3 +1211,11 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "最終更新:"
+
+#~ msgid ""
+#~ "<a href=\"/philosophy/ebooks-must-increase-freedom.html\"> Ebooks must "
+#~ "increase our freedom, not decrease it</a><a href=\"/philosophy/ebooks-"
+#~ "must-increase-freedom.html\"> 
Ebooksはわたしたちの自由を増やすべきであり、"
+#~ "減じてはならない</a>"
+#~ msgstr ""
+#~ "<a 
href=\"/philosophy/fs-motives.html\">自由ソフトウェアを書く動機</a>"

Index: server/sitemap.ja.html
===================================================================
RCS file: /web/www/www/server/sitemap.ja.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/sitemap.ja.html      14 May 2012 16:36:14 -0000      1.18
+++ server/sitemap.ja.html      15 May 2012 08:28:18 -0000      1.19
@@ -462,6 +462,7 @@
   <li><a href="/graphics/distros-dragora.html">distros-dragora.html -
 Dragoraのロゴ</a></li>
   <li><a href="/graphics/emacs-ref.html">emacs-ref.html - GNU Emacs 
リファレンス・カード</a></li>
+  <li><a href="/graphics/freedom.html">freedom.html - 
自由の意味するところ</a></li>
   <li><a href="/graphics/fromagnulinux.html">fromagnulinux.html -
 Fromagnulinux</a></li>
   <li><a href="/graphics/fsf-logo.html">fsf-logo.html - FSF ロゴ</a></li>
@@ -675,7 +676,7 @@
 v2.0についてよくある質問</a></li>
   <li><a
 href="/licenses/old-licenses/gpl-2.0-standalone.html">gpl-2.0-standalone.html
-- GNU一般公衆ライセンスv2</a></li>
+- GNU一般公衆ライセンス v2.0</a></li>
   <li><a
 
href="/licenses/old-licenses/gpl-2.0-translations.html">gpl-2.0-translations.html
 - 非公式GNU GPL v2.0の翻訳</a></li>
@@ -790,6 +791,9 @@
 
href="/philosophy/copyright-versus-community.html">copyright-versus-community-2000.html
 - 
コンピュータネットワーク時代における著作権対コミュニティ</a></li>
   <li><a
+href="/philosophy/correcting-france-mistake.html">correcting-france-mistake.html
+- 
フランスの法律についてのわたしの間違いを修正する</a></li>
+  <li><a
 
href="/philosophy/danger-of-software-patents.html">danger-of-software-patents.html
 - ソフトウェア特許の危険</a></li>
   <li><a href="/philosophy/dat.html">dat.html - 
DATへの正しい課税のやり方</a></li>
@@ -799,6 +803,9 @@
   <li><a href="/philosophy/dmarti-patent.html">dmarti-patent.html - 
特許法改正の今</a></li>
   <li><a href="/philosophy/drdobbs-letter.html">drdobbs-letter.html - Dr. 
Dobb's
 Journalの編集者への手紙</a></li>
+  <li><a
+href="/philosophy/ebooks-must-increase-freedom.html">ebooks-must-increase-freedom.html
+- E-books 
はわたしたちの自由を増やすべきであり、減じるべきではない</a></li>
   <li><a href="/philosophy/ebooks.html">ebooks.html - Ebooks: 
自由か著作権か - RMS</a></li>
   <li><a href="/philosophy/eldred-amicus.html">eldred-amicus.html -
 FSFのEldred対Ashcroft裁判における助言要約</a></li>
@@ -1374,7 +1381,7 @@
 <!-- timestamp start -->
 最終更新:
 
-$Date: 2012/05/14 16:36:14 $
+$Date: 2012/05/15 08:28:18 $
 
 <!-- timestamp end -->
 </p>
@@ -1415,7 +1422,7 @@
 <li><a href="/server/sitemap.de.html">Deutsch</a>&nbsp;[de]</li>
 
 <!-- English -->
-<li><a href="/server/sitemap.en.html">English</a>&nbsp;[en]</li>
+<li><a href="/server/sitemap.html">English</a>&nbsp;[en]</li>
 
 <!-- Spanish -->
 <li><a href="/server/sitemap.es.html">Espa&#x00f1;ol</a>&nbsp;[es]</li>

Index: server/po/sitemap.ja-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.ja-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/po/sitemap.ja-en.html        28 Apr 2012 16:29:34 -0000      1.2
+++ server/po/sitemap.ja-en.html        15 May 2012 08:28:36 -0000      1.3
@@ -368,6 +368,7 @@
   <li><a 
href="/graphics/digital-restrictions-management.html">digital-restrictions-management.html
 - GNU Art - Digital Restrictions Management</a></li>
   <li><a href="/graphics/distros-dragora.html">distros-dragora.html - Dragora 
Logo</a></li>
   <li><a href="/graphics/emacs-ref.html">emacs-ref.html - GNU Emacs Reference 
Card</a></li>
+  <li><a href="/graphics/freedom.html">freedom.html - What Freedom 
Means</a></li>
   <li><a href="/graphics/fromagnulinux.html">fromagnulinux.html - 
Fromagnulinux</a></li>
   <li><a href="/graphics/fsf-logo.html">fsf-logo.html - FSF Logo</a></li>
   <li><a href="/graphics/FSFS-logo.html">FSFS-logo.html - Free Software, Free 
Society Title Logo</a></li>
@@ -515,12 +516,12 @@
   <li><a 
href="/licenses/old-licenses/gpl-1.0-standalone.html">gpl-1.0-standalone.html - 
GNU General Public License v1.0</a></li>
   <li><a href="/licenses/old-licenses/gpl-1.0.html">gpl-1.0.html - GNU General 
Public License v1.0</a></li>
   <li><a href="/licenses/old-licenses/gpl-2.0-faq.html">gpl-2.0-faq.html - 
Frequently Asked Questions about the GNU GPL v2.0</a></li>
-  <li><a 
href="/licenses/old-licenses/gpl-2.0-standalone.html">gpl-2.0-standalone.html - 
GNU General Public License v2</a></li>
+  <li><a 
href="/licenses/old-licenses/gpl-2.0-standalone.html">gpl-2.0-standalone.html - 
GNU General Public License v2.0</a></li>
   <li><a 
href="/licenses/old-licenses/gpl-2.0-translations.html">gpl-2.0-translations.html
 - Unofficial GNU GPL v2.0 Translations</a></li>
   <li><a href="/licenses/old-licenses/gpl-2.0.html">gpl-2.0.html - GNU General 
Public License v2.0</a></li>
   <li><a 
href="/licenses/old-licenses/lgpl-2.0-standalone.html">lgpl-2.0-standalone.html 
- GNU Library General Public License v2.0</a></li>
   <li><a href="/licenses/old-licenses/lgpl-2.0.html">lgpl-2.0.html - GNU 
Library General Public License v2.0</a></li>
-  <li><a 
href="/licenses/old-licenses/lgpl-2.1-standalone.html">lgpl-2.1-standalone.html 
- GNU Lesser General Public License v2.1</a></li>
+  <li><a 
href="/licenses/old-licenses/lgpl-2.1-standalone.html">lgpl-2.1-standalone.html 
- GNU Lesser General Public License v2.0</a></li>
   <li><a 
href="/licenses/old-licenses/lgpl-2.1-translations.html">lgpl-2.1-translations.html
 - Unofficial LGPL v2.1 Translations</a></li>
   <li><a href="/licenses/old-licenses/lgpl-2.1.html">lgpl-2.1.html - GNU 
Lesser General Public License v2.1</a></li>
 </ul>
@@ -594,11 +595,13 @@
   <li><a 
href="/philosophy/copyright-and-globalization.html">copyright-and-globalization.html
 - Copyright and Globalization in the Age of Computer Networks</a></li>
   <li><a 
href="/philosophy/copyright-versus-community-2000.html">copyright-versus-community-2000.html
 - Copyright versus Community in the Age of Computer Networks</a></li>
   <li><a 
href="/philosophy/copyright-versus-community.html">copyright-versus-community.html
 - Copyright versus Community in the Age of Computer Networks</a></li>
+  <li><a 
href="/philosophy/correcting-france-mistake.html">correcting-france-mistake.html
 - Correcting My Mistake about French Law</a></li>
   <li><a 
href="/philosophy/danger-of-software-patents.html">danger-of-software-patents.html
 - The Danger of Software Patents</a></li>
   <li><a href="/philosophy/dat.html">dat.html - The Right Way to Tax 
DAT</a></li>
   <li><a 
href="/philosophy/digital-inclusion-in-freedom.html">digital-inclusion-in-freedom.html
 - Is Digital Inclusion A Good Thing? How Can We Make Sure It Is?</a></li>
   <li><a href="/philosophy/dmarti-patent.html">dmarti-patent.html - Patent 
Reform Now</a></li>
   <li><a href="/philosophy/drdobbs-letter.html">drdobbs-letter.html - Letter 
to the Editor of Dr. Dobb's Journal</a></li>
+  <li><a 
href="/philosophy/ebooks-must-increase-freedom.html">ebooks-must-increase-freedom.html
 - E-books must increase our freedom, not decrease it</a></li>
   <li><a href="/philosophy/ebooks.html">ebooks.html - E-Books: Freedom Or 
Copyright - RMS</a></li>
   <li><a href="/philosophy/eldred-amicus.html">eldred-amicus.html - FSF's 
Brief Amicus Curiae, Eldred v. Ashcroft</a></li>
   <li><a href="/philosophy/enforcing-gpl.html">enforcing-gpl.html - Enforcing 
the GNU GPL</a></li>
@@ -970,7 +973,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/04/28 16:29:34 $
+$Date: 2012/05/15 08:28:36 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/po/sitemap.ja.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ja.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/po/sitemap.ja.po     15 May 2012 06:13:35 -0000      1.44
+++ server/po/sitemap.ja.po     15 May 2012 08:28:36 -0000      1.45
@@ -2694,8 +2694,8 @@
 "a>"
 msgstr ""
 "<a href=\"/philosophy/ebooks-must-increase-freedom.html\">ebooks-must-"
-"increase-freedom.html - E-books 
はわたしたちの自由を増やすべきであり、減じるべきではない</"
-"a>"
+"increase-freedom.html - E-books 
はわたしたちの自由を増やすべきであり、減じる"
+"べきではない</a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid ""



reply via email to

[Prev in Thread] Current Thread [Next in Thread]