www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www distros/distros.de.html distros/distros.it....

From: GNUN
Subject: www distros/distros.de.html distros/distros.it....
Date: Sun, 07 Oct 2012 00:27:50 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/10/07 00:27:50

Modified files:
        distros        : distros.de.html distros.it.html 
        distros/po     : distros.de-en.html distros.it-en.html 
                         distros.it.po 
        education      : edu-cases-india-irimpanam.de.html 
                         education.de.html 
        education/misc : edu-misc.de.html 
        education/misc/po: edu-misc.de-en.html 
        education/po   : edu-cases-india-irimpanam.de-en.html 
                         education.de-en.html 
        licenses       : gpl-faq.ru.html 
        licenses/po    : gpl-faq.ru-en.html gpl-faq.ru.po 
        philosophy     : essays-and-articles.de.html 
                         latest-articles.de.html philosophy.de.html 
        philosophy/po  : essays-and-articles.de-en.html 
                         latest-articles.de-en.html 
                         philosophy.de-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/distros.de.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/distros.it.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.de-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.it-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/distros.it.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-cases-india-irimpanam.de.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/education/education.de.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/edu-misc.de.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/po/edu-misc.de-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-cases-india-irimpanam.de-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.de-en.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.de.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/latest-articles.de.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.de.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.de-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/latest-articles.de-en.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.de-en.html?cvsroot=www&r1=1.24&r2=1.25

Patches:
Index: distros/distros.de.html
===================================================================
RCS file: /web/www/www/distros/distros.de.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- distros/distros.de.html     27 Sep 2012 16:52:19 -0000      1.24
+++ distros/distros.de.html     7 Oct 2012 00:27:47 -0000       1.25
@@ -57,6 +57,14 @@
 entfernen und damit ausschließlich Freie Software bereitzustellen.
 </p>
 
+<h3 id="optionallyFree">Wahlweise <em>frei</em> ist nicht genug</h3>
+<p>
+Einige GNU/Linux Distributionen erlauben dem Nutzer die Möglichkeit,
+ausschließlich Freie Software zu installieren. Lesen Sie weitere
+Informationen zum Thema:<br />
+<a href="/distros/optionally-free-not-enough.html" hreflang="en">Wahlweise
+<em>frei</em> ist genug nicht</a>.</p>
+
 <h3 id="whyImportant">Warum ist das wichtig?</h3>
 <p>
 Ist in einer GNU/Linux-Distribution sowohl freie als auch unfreie Software
@@ -150,7 +158,7 @@
 <!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:52:19 $
+$Date: 2012/10/07 00:27:47 $
 
 <!-- timestamp end -->
 </p>

Index: distros/distros.it.html
===================================================================
RCS file: /web/www/www/distros/distros.it.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- distros/distros.it.html     27 Sep 2012 16:52:19 -0000      1.19
+++ distros/distros.it.html     7 Oct 2012 00:27:47 -0000       1.20
@@ -59,6 +59,13 @@
 libero.
 </p>
 
+<h3 id="optionallyFree">"Libero se si desidera" non basta</h3>
+<p>
+Alcune distribuzioni GNU/Linux danno all'utente la possibilità di scegliere
+di installare solo software libero. Leggere:<br />
+<a href="/distros/optionally-free-not-enough.html"> Perché "Libero se si
+desidera" non basta.</a></p>
+
 <h3 id="whyImportant">Perché è importante?</h3>
 <p>
 Quando una distribuzione GNU/Linux include software non libero, provoca due
@@ -148,7 +155,7 @@
 <!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2012/09/27 16:52:19 $
+$Date: 2012/10/07 00:27:47 $
 
 <!-- timestamp end -->
 </p>

Index: distros/po/distros.de-en.html
===================================================================
RCS file: /web/www/www/distros/po/distros.de-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- distros/po/distros.de-en.html       27 Sep 2012 16:52:21 -0000      1.18
+++ distros/po/distros.de-en.html       7 Oct 2012 00:27:48 -0000       1.19
@@ -53,6 +53,12 @@
 thus make them entirely free software.
 </p>
 
+<h3 id="optionallyFree">Optionally Free Is Not Enough</h3>
+<p>
+Some GNU/Linux distributions allow the user the option of installing only free 
software. You can read:<br />
+<a href="/distros/optionally-free-not-enough.html">
+Why optionally free is not enough.</a></p>
+
 <h3 id="whyImportant">Why Is This Important?</h3>
 <p>
 When a GNU/Linux distro includes nonfree software, it causes two kinds
@@ -125,7 +131,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:52:21 $
+$Date: 2012/10/07 00:27:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/distros.it-en.html
===================================================================
RCS file: /web/www/www/distros/po/distros.it-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/po/distros.it-en.html       27 Sep 2012 16:52:21 -0000      1.10
+++ distros/po/distros.it-en.html       7 Oct 2012 00:27:48 -0000       1.11
@@ -53,6 +53,12 @@
 thus make them entirely free software.
 </p>
 
+<h3 id="optionallyFree">Optionally Free Is Not Enough</h3>
+<p>
+Some GNU/Linux distributions allow the user the option of installing only free 
software. You can read:<br />
+<a href="/distros/optionally-free-not-enough.html">
+Why optionally free is not enough.</a></p>
+
 <h3 id="whyImportant">Why Is This Important?</h3>
 <p>
 When a GNU/Linux distro includes nonfree software, it causes two kinds
@@ -125,7 +131,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:52:21 $
+$Date: 2012/10/07 00:27:48 $
 <!-- timestamp end -->
 </p>
 </div>

Index: distros/po/distros.it.po
===================================================================
RCS file: /web/www/www/distros/po/distros.it.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- distros/po/distros.it.po    6 Oct 2012 21:41:45 -0000       1.25
+++ distros/po/distros.it.po    7 Oct 2012 00:27:48 -0000       1.26
@@ -14,7 +14,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-10-05 20:25-0300\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>

Index: education/edu-cases-india-irimpanam.de.html
===================================================================
RCS file: /web/www/www/education/edu-cases-india-irimpanam.de.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education/edu-cases-india-irimpanam.de.html 27 Sep 2012 16:52:25 -0000      
1.21
+++ education/edu-cases-india-irimpanam.de.html 7 Oct 2012 00:27:48 -0000       
1.22
@@ -161,7 +161,7 @@
 zahlreichen hochwertigen Bildungsanwendungen möglich, die in GNU/Linux
 verfügbar sind.</p>
 
-<p>Die Transparenz und die kooperative Methode von Freie Software halfen
+<p>Die Transparenz und die kooperative Methode von freier Software halfen
 SchülerInnen und Lehrkräften, tief in die Technik einzutauchen und
 ermöglichte auf vielfältigste Weise zur Gemeinschaft beizutragen. Ein
 wichtiger Beitrag war die Lokalisierung der Benutzeroberfläche von <a
@@ -170,17 +170,24 @@
 
 <p>Ein weiterer Beitrag war die Aufnahme neuer Stempel in
 TuxPaint. Einheimische Blumen wurden fotografiert und von SchülerInnen der
-6. und 7. Klasse mit dem Bildbearbeitungsprogramm GIMP bearbeitet.</p> 
-
-<p>Die dabei entstandenen Bilder wurden dann mit dem Namen der Blumen auf
-Malayalam in TuxPaint integriert. Darüber hinaus haben SchülerInnen mit
-ihren eigenen Stimmen die Namen der Blumen aufgenommen, damit Nutzer bei
-Auswahl des Stempels den Namen der Blume auf Malayalam hören können. <a
-href="http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";
-type="application/ogg">Video ansehen und herunterladen (auf Englisch)</a>
-(<a href="/education/misc/irimpanam.en.srt"
-type='text/plain'>SubRip-Untertitel (auf Englisch)</a>).</p> 
-
+6. und 7. Klasse mit dem Bildbearbeitungsprogramm GIMP bearbeitet. Die
+entstandenen Bilder wurden dann in TuxPaint mit dem Namen der Blumen auf
+Malayalam versehen. Außerdem nahmen die Schülerinnen und Schüler mit ihren
+eigenen Stimmen den Namen der Blumen auf, damit ein Nutzer bei der Auswahl
+eines des Stempels den Namen auf Malayalam hört. Um die Funktion und
+Vorgehensweise zu veranschaulichen, wurde ein Video aufgenommen.</p> 
+
+<p>
+
+<!-- TRANSLATORS: Replace the link to the video with subtitles in English with 
+ a link to the video with subtitles in your language, if it exists. Likewise, 
+ modify the link to SubRip subtitles accordingly, and replace the word 
"English" 
+ with the name of your language. -->
+<a href="http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";
+hreflang="en">Video angucken und herunterladen</a>. <a
+href="/education/misc/irimpanam.en.srt" hreflang="en">Untertitel lesen und
+herunterladen (SubRip-Format)</a>.
+</p> 
 
 <p>Beide Aktivitäten wurden durch <a
 href="http://sskvhssirimpanam.wordpress.com/";>Swathanthra Software Koottayma
@@ -269,7 +276,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:52:25 $
+$Date: 2012/10/07 00:27:48 $
 
 <!-- timestamp end -->
 </p>

Index: education/education.de.html
===================================================================
RCS file: /web/www/www/education/education.de.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- education/education.de.html 27 Sep 2012 16:52:30 -0000      1.28
+++ education/education.de.html 7 Oct 2012 00:27:48 -0000       1.29
@@ -79,7 +79,8 @@
 href="/education/misc/rms-education-es-transcription.de.txt">Deutsch</a>, <a
 href="/education/misc/rms-education-es-translation-to-en.txt">Englisch</a>,
 <a href="/education/misc/rms-education-es-transcription.txt">Spanisch</a>
-und <a href="/education/misc/edu-misc.html#transcriptions">weiteren
+und <a
+href="/education/misc/edu-misc.html#transcription-rms-education">weiteren
 Sprachen</a> abrufbar. 
 </p>
 
@@ -184,7 +185,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:52:30 $
+$Date: 2012/10/07 00:27:48 $
 
 <!-- timestamp end -->
 </p>

Index: education/misc/edu-misc.de.html
===================================================================
RCS file: /web/www/www/education/misc/edu-misc.de.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- education/misc/edu-misc.de.html     27 Sep 2012 16:52:30 -0000      1.20
+++ education/misc/edu-misc.de.html     7 Oct 2012 00:27:49 -0000       1.21
@@ -180,15 +180,24 @@
 <p>&rarr; <em>Freiheit in der Praxis an der VHHS Irimpanam</em></p>
 
 <ul> 
+  <li>auf Malayalam: <a
+href="http://audio-video.gnu.org/video/irimpanam-high.ogv";>107 MB</a></li> 
+</ul>      
+
+<p>&#160;&#160;Andere Versionen mit Untertiteln in den folgenden Sprachen:</p>
+
+    <ul> 
   <li>auf Malayalam (englische Untertitel): <a
-href="http://audio-video.gnu.org/video/rms-education-es-sub-en.ogv";>40
-MB</a></li> 
+href="http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";>109 
MB</a></li> 
+      <li>auf Malayalam (französische Untertitel): <a
+href="http://audio-video.gnu.org/video/irimpanam-high-sub.fr.ogv";>110 
MB</a></li> 
 </ul>      
 
+
 <h3 id="transcriptions">Transkriptionen und Beschreibungen der Videos</h3>
 
 <ul>
-<li><em>Richard Stallman über Bildung</em>-Transkriptionen</li>
+<li id="transcription-rms-education"><em>Richard Stallman über 
Bildung</em>-Transkriptionen</li>
 </ul>
 
 <!-- Add languages in alphabetical order -->
@@ -217,7 +226,7 @@
 <h3 id="subtitles">Untertitel der Videos (SubRip)</h3>
 
 <ul>
-<li><em>Richard Stallman über Bildung</em></li>
+<li id="subtitles-rms-education"><em>Richard Stallman über Bildung</em></li>
 </ul>
 
 <!-- Add languages in alphabetical order -->
@@ -229,7 +238,7 @@
 href="/education/misc/rms-education-es-sub.es.srt">Spanisch</a>
 
 <ul>
-<li><em>Freiheit in der Praxis an der VHHS Irimpanam</em></li>
+<li id="subtitles-irimpanam"><em>Freiheit in der Praxis an der VHHS 
Irimpanam</em></li>
 </ul>
 
 <!-- Add languages in alphabetical order -->
@@ -299,7 +308,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:52:30 $
+$Date: 2012/10/07 00:27:49 $
 
 <!-- timestamp end -->
 </p>

Index: education/misc/po/edu-misc.de-en.html
===================================================================
RCS file: /web/www/www/education/misc/po/edu-misc.de-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- education/misc/po/edu-misc.de-en.html       27 Sep 2012 16:52:31 -0000      
1.18
+++ education/misc/po/edu-misc.de-en.html       7 Oct 2012 00:27:49 -0000       
1.19
@@ -167,14 +167,25 @@
 <p>&rarr; Video &ldquo;Freedom in Practice at Irimpanam School&rdquo;:</p>
 
 <ul> 
-  <li><a href="http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";>
-      Original version in Malayalam with English subtitles</a>, 40 MB.</li> 
+  <li><a href="http://audio-video.gnu.org/video/irimpanam-high.ogv";>
+      Original version in Malayalam without subtitles</a>, 107 MB.</li> 
 </ul>      
 
+<p>&nbsp; Other versions with embedded subtitles in the following 
languages:</p>
+
+    <ul> 
+      <li>English:  
+          <a 
href="http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";>109 
MB</a></li> 
+      <li>French:  
+          <a 
href="http://audio-video.gnu.org/video/irimpanam-high-sub.fr.ogv";>110 
MB</a></li> 
+</ul>           
+
+
 <h3 id="transcriptions">Video Transcriptions and Descriptions</h3>
 
 <ul>
-<li>Transcriptions of Richard Stallman's video on education:</li>
+<li id="transcription-rms-education">Transcriptions of Richard Stallman's 
video 
+    on education:</li>
 </ul>
 
 <!-- Add languages in alphabetical order --> 
@@ -182,7 +193,8 @@
 <a href="/education/misc/rms-education-es-transcription.fr.txt">French</a> |
 <a href="/education/misc/rms-education-es-transcription.de.txt">German</a> |
 <a href="/education/misc/rms-education-es-transcription.it.txt">Italian</a> |
-<a href="/education/misc/rms-education-es-translation-to-pt-br.txt">Portuguese 
(Brazilian)</a> |   
+<a href="/education/misc/rms-education-es-translation-to-pt-br.txt">Portuguese 
+   (Brazilian)</a> |   
 <a href="/education/misc/rms-education-es-transcription.txt">Spanish</a> |
 
 <ul>
@@ -197,7 +209,8 @@
 <h3 id="subtitles">Video Subtitles in SubRip Format</h3>
 
 <ul>
-<li>Subtitles for Richard Stallman's video on education:</li>
+<li id="subtitles-rms-education">Subtitles for Richard Stallman's video on 
+    education:</li>
 </ul>
 
 <!-- Add languages in alphabetical order --> 
@@ -209,13 +222,13 @@
 <a href="/education/misc/rms-education-es-sub.es.srt">Spanish</a> |
 
 <ul>
-<li>Subtitles for the video &ldquo;Freedom in Practice at Irimpanam 
-    School&rdquo;:</li>
+<li id="subtitles-irimpanam">Subtitles for the video &ldquo;Freedom in 
Practice 
+at Irimpanam School&rdquo;:</li>
 </ul>
 
 <!-- Add languages in alphabetical order --> 
 <a href="/education/misc/irimpanam.en.srt">English</a> |
-<a href="/education/misc/irimpanam.fr.srt">French</a>
+<a href="/education/misc/irimpanam.fr.srt">French</a> |
 
 <h3>Audio</h3>
 
@@ -263,7 +276,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:52:31 $
+$Date: 2012/10/07 00:27:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education/po/edu-cases-india-irimpanam.de-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-cases-india-irimpanam.de-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- education/po/edu-cases-india-irimpanam.de-en.html   27 Sep 2012 16:52:32 
-0000      1.19
+++ education/po/edu-cases-india-irimpanam.de-en.html   7 Oct 2012 00:27:49 
-0000       1.20
@@ -159,18 +159,23 @@
 <a href="/education/edu-software-tuxpaint.html">Tux Paint</a> in 
 Malayalam, our mother tongue.</p>
 
-<p>Another contribution was the addition of new stamps in TuxPaint. 
-Native flowers were photographed and the pictures edited by 6th and 7th 
-grade students using the image editing program GIMP.</p> 
-
-<p>The resulting images were then integrated in TuxPaint with the name 
-of the flowers written in Malayalam. As a plus, students recorded with 
-their own voices the name of the flowers, so when the user selects one 
-of the stamps, she will hear the name of the flower in Malayalam. 
-<a href="http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";>
-Watch and download the video</a> and <a 
-href="/education/misc/irimpanam.en.srt">the SubRip subtitles</a>.</p> 
+<p>Another contribution was the addition of new stamps in TuxPaint. Native 
+flowers were photographed and the pictures edited by 6th and 7th grade 
students 
+using the image editing program GIMP. The resulting images were then 
integrated 
+in TuxPaint with the name of the flowers written in Malayalam. As a plus, 
+students recorded with their own voices the name of the flowers, so when the 
+user selects one of the stamps, she will hear the name of the flower in 
+Malayalam. A video was recorded to illustrate how it works and how the 
activity 
+was done.</p> 
+
+<p>
+<!-- TRANSLATORS: Replace the link to the video with subtitles in English with 
+ a link to the video with subtitles in your language, if it exists. Likewise, 
+ modify the link to SubRip subtitles accordingly, and replace the word 
"English" 
+ with the name of your language. --> 
 
+<a href="http://audio-video.gnu.org/video/irimpanam-high-sub.en.ogv";>Watch and 
download the video</a>. <a href="/education/misc/irimpanam.en.srt">Read and 
download the English subtitles in SubRip format</a>.
+</p> 
 
 <p>Both activities were promoted by Swathanthra Software Koottayma of 
 VHSS Irimpanam <a href="http://sskvhssirimpanam.wordpress.com/";>
@@ -239,7 +244,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:52:32 $
+$Date: 2012/10/07 00:27:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education/po/education.de-en.html
===================================================================
RCS file: /web/www/www/education/po/education.de-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- education/po/education.de-en.html   27 Sep 2012 16:52:38 -0000      1.20
+++ education/po/education.de-en.html   7 Oct 2012 00:27:49 -0000       1.21
@@ -76,7 +76,8 @@
 
 <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>. 
+<a href="/education/misc/edu-misc.html#transcription-rms-education">
+   other languages</a>. 
 </p>
 
 <p> 
@@ -86,7 +87,8 @@
 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>. 
+<a href="/education/misc/edu-misc.html#subtitles-rms-education">other 
+   languages</a>. 
 </p>
 
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
@@ -165,7 +167,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:52:38 $
+$Date: 2012/10/07 00:27:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- licenses/gpl-faq.ru.html    27 Sep 2012 16:53:19 -0000      1.20
+++ licenses/gpl-faq.ru.html    7 Oct 2012 00:27:49 -0000       1.21
@@ -1734,12 +1734,16 @@
 <dt id="ModifyGPL">Можно мне изменить GPL и сделать 
другую лицензию? <span
 class="anchor-reference-id">(<a href="#ModifyGPL" >#ModifyGPL</a>)</span></dt>
 <dd><p>
-Вы можете пользоваться условиями GPL 
(возможно, измененными) в другой
-лицензии при условии, что вы назовете свою 
лицензию по-другому и не включите
-в нее преамбулу GPL, и при условии, что вы 
внесете изменения в руководство к
-применению в конце, достаточные, чтобы его 
формулировки явно отличались от
-исходных и чтобы оно не упоминало GNU (хотя в 
действительности процедура,
-которую вы описываете, может быть сх
одна).</p>
+Сделать измененную версию GPL возможно, но 
это, вероятно, будет иметь
+практические последствия.</p>
+
+<p>
+По закону вы можете пользоваться 
условиями GPL (возможно, измененными) в
+другой лицензии при условии, что вы 
назовете свою лицензию по-другому и не
+включите в нее преамбулу GPL, и при условии, 
что вы внесете изменения в
+руководство к применению в конце, 
достаточные, чтобы его формулировки явно
+отличались от исходных и чтобы оно не 
упоминало GNU (хотя в действительности
+процедура, которую вы описываете, может 
быть сходна).</p>
 
 <p> Если вы хотите воспользоваться нашей 
преамбулой в измененной лицензии,
 запросите, пожалуйста, разрешение по 
адресу <a
@@ -1753,7 +1757,10 @@
 href="#WhatIsCompatible">несовместима с GNU GPL</a>, а 
такая несовместимость
 препятствует полезному комбинированию 
модулей. Уже одно увеличение
 численности разных лицензий свободных 
программ само по себе создает
-дополнительные сложности.</p></dd>
+дополнительные сложности.</p>
+
+<p>Вместо изменения GPL воспользуйтесь, 
пожалуйста, механизмом исключений,
+предлагаемым версией&nbsp;3 GPL.</p></dd>
 
 
 <dt id="GPLCommercially">Если я пользуюсь программой, 
которая получена на условиях GNU GPL, могу ли я
@@ -3545,7 +3552,7 @@
 <!-- timestamp start -->
 Обновлено:
 
-$Date: 2012/09/27 16:53:19 $
+$Date: 2012/10/07 00:27:49 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- licenses/po/gpl-faq.ru-en.html      27 Sep 2012 16:53:28 -0000      1.18
+++ licenses/po/gpl-faq.ru-en.html      7 Oct 2012 00:27:49 -0000       1.19
@@ -1775,7 +1775,11 @@
  <span class="anchor-reference-id">(<a href="#ModifyGPL"
  >#ModifyGPL</a>)</span></dt>
 <dd><p>
-You can use the GPL terms (possibly modified) in another license
+It is possible to make modified versions of the GPL, but it
+tends to have practical consequences.</p>
+
+<p>
+You can legally use the GPL terms (possibly modified) in another license
 provided that you call your license by another name and do not include
 the GPL preamble, and provided you modify the instructions-for-use at
 the end enough to make it clearly different in wording and not mention
@@ -1791,7 +1795,10 @@
 a modified license is almost certainly <a href="#WhatIsCompatible">
 incompatible with the GNU GPL</a>, and that incompatibility blocks
 useful combinations of modules.  The mere proliferation of different
-free software licenses is a burden in and of itself.</p></dd>
+free software licenses is a burden in and of itself.</p>
+
+<p>Rather than modifying the GPL, please use the exception mechanism
+offered by GPL version 3.</p></dd>
 
 
 <dt id="GPLCommercially">If I use a
@@ -3578,7 +3585,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:53:28 $
+$Date: 2012/10/07 00:27:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- licenses/po/gpl-faq.ru.po   6 Oct 2012 17:02:45 -0000       1.30
+++ licenses/po/gpl-faq.ru.po   7 Oct 2012 00:27:49 -0000       1.31
@@ -19,7 +19,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-10-06 12:25-0300\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -3696,17 +3695,6 @@
 "практические последствия."
 
 #. type: Content of: <dl><dd><p>
-# | You can {+legally+} use the GPL terms (possibly modified) in another
-# | license provided that you call your license by another name and do not
-# | include the GPL preamble, and provided you modify the instructions-for-use
-# | at the end enough to make it clearly different in wording and not mention
-# | GNU (though the actual procedure you describe may be similar).
-#| msgid ""
-#| "You can use the GPL terms (possibly modified) in another license provided "
-#| "that you call your license by another name and do not include the GPL "
-#| "preamble, and provided you modify the instructions-for-use at the end "
-#| "enough to make it clearly different in wording and not mention GNU "
-#| "(though the actual procedure you describe may be similar)."
 msgid ""
 "You can legally use the GPL terms (possibly modified) in another license "
 "provided that you call your license by another name and do not include the "
@@ -3714,12 +3702,12 @@
 "enough to make it clearly different in wording and not mention GNU (though "
 "the actual procedure you describe may be similar)."
 msgstr ""
-"По закону вы можете пользоваться 
условиями GPL (возможно, измененными) в 
другой "
-"лицензии при условии, что вы назовете свою 
лицензию по-другому и не включите "
-"в нее преамбулу GPL, и при условии, что вы 
внесете изменения в руководство к "
-"применению в конце, достаточные, чтобы его 
формулировки явно отличались от "
-"исходных и чтобы оно не упоминало GNU (хотя 
в действительности процедура, "
-"которую вы описываете, может быть сходна)."
+"По закону вы можете пользоваться 
условиями GPL (возможно, измененными) в "
+"другой лицензии при условии, что вы 
назовете свою лицензию по-другому и не "
+"включите в нее преамбулу GPL, и при условии, 
что вы внесете изменения в "
+"руководство к применению в конце, 
достаточные, чтобы его формулировки явно "
+"отличались от исходных и чтобы оно не 
упоминало GNU (хотя в действительности "
+"процедура, которую вы описываете, может 
быть сходна)."
 
 #. type: Content of: <dl><dd><p>
 msgid ""

Index: philosophy/essays-and-articles.de.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.de.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/essays-and-articles.de.html      27 Sep 2012 16:53:49 -0000      
1.31
+++ philosophy/essays-and-articles.de.html      7 Oct 2012 00:27:50 -0000       
1.32
@@ -53,6 +53,9 @@
   <li><a href="/philosophy/selling">Verkauf von freier Software</a> ist 
Ok!</li>
   <li><a href="/philosophy/categories">Kategorien freier und unfreier 
Software</a></li>
   <li><a href="/software/reliability">Freie Software ist 
zuverlässiger!</a></li>
+<li><a href="/philosophy/when_free_software_isnt_practically_better.html"
+hreflang="en">
+Wenn Freie Software nicht (praktisch) besser ist</a></li>
   <li><a href="/philosophy/open-source-misses-the-point">Warum &#8222;Open
 Source&#8220; das Ziel von <em>Freie Software</em> verfehlt</a></li>
   <li><a href="/philosophy/linux-gnu-freedom">Linux, GNU und Freiheit</a></li>
@@ -540,7 +543,7 @@
 <!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:53:49 $
+$Date: 2012/10/07 00:27:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/latest-articles.de.html
===================================================================
RCS file: /web/www/www/philosophy/latest-articles.de.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/latest-articles.de.html  27 Sep 2012 16:53:57 -0000      1.25
+++ philosophy/latest-articles.de.html  7 Oct 2012 00:27:50 -0000       1.26
@@ -21,6 +21,8 @@
 <p>Druckfrisch, die neuesten Aufsätze &amp; Artikel über Freie Software und 
dem
 GNU-Projekt.</p>
 <ul>
+<li><a href="/philosophy/when_free_software_isnt_practically_better.html"
+hreflang="en">Wenn Freie Software nicht (praktisch) besser ist</a></li>
   <li><a href="/philosophy/programs-must-not-limit-freedom.html"
 hreflang="en">Warum Programme die Freiheit nicht beschränken dürfen, um sie
 auszuführen</a></li>
@@ -115,7 +117,7 @@
 <!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:53:57 $
+$Date: 2012/10/07 00:27:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/philosophy.de.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.de.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- philosophy/philosophy.de.html       27 Sep 2012 16:54:09 -0000      1.40
+++ philosophy/philosophy.de.html       7 Oct 2012 00:27:50 -0000       1.41
@@ -57,6 +57,8 @@
 Stallman</a></li>
   <li><a href="/philosophy/open-source-misses-the-point">Warum &#8222;Open
 Source&#8220; das Ziel von <em>Freie Software</em> verfehlt</a></li>
+ <li><a href="/philosophy/when_free_software_isnt_practically_better.html"
+hreflang="en">Wenn Freie Software nicht (praktisch) besser ist</a></li>
   <li><a href="/philosophy/government-free-software.html" 
hreflang="en">Maßnahmen
 die Regierungen verwenden können, um freie Software zu fördern</a></li>      
 
 </ul>
@@ -128,7 +130,7 @@
 <!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/27 16:54:09 $
+$Date: 2012/10/07 00:27:50 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/essays-and-articles.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.de-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/essays-and-articles.de-en.html        27 Sep 2012 16:55:13 
-0000      1.23
+++ philosophy/po/essays-and-articles.de-en.html        7 Oct 2012 00:27:50 
-0000       1.24
@@ -46,6 +46,7 @@
   <li><a href="/philosophy/categories.html">Categories of Free and
        Non-Free Software</a></li>
   <li><a href="/software/reliability.html">Free Software is More 
Reliable!</a></li>
+<li><a href="/philosophy/when_free_software_isnt_practically_better.html">When 
Free Software Isn't (Practically) Better</a></li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
        &ldquo;Open Source&rdquo; misses the point of Free Software</a></li>
   <li><a href="/philosophy/linux-gnu-freedom.html">Linux, GNU, and
@@ -478,7 +479,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:55:13 $
+$Date: 2012/10/07 00:27:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/latest-articles.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/latest-articles.de-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/latest-articles.de-en.html    27 Sep 2012 16:55:30 -0000      
1.24
+++ philosophy/po/latest-articles.de-en.html    7 Oct 2012 00:27:50 -0000       
1.25
@@ -15,6 +15,7 @@
 <p>Hot off the presses, here are the latest published articles on free
 software and the GNU project.</p>
 <ul>
+<li><a href="/philosophy/when_free_software_isnt_practically_better.html">When 
Free Software Isn't (Practically) Better</a></li>
   <li><a href="/philosophy/programs-must-not-limit-freedom.html">Why
   programs must not limit the freedom to run them</a></li>
   <li><a href="/philosophy/bug-nobody-allowed-to-understand.html">The
@@ -85,7 +86,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:55:30 $
+$Date: 2012/10/07 00:27:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/philosophy.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.de-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/philosophy.de-en.html 27 Sep 2012 16:55:44 -0000      1.24
+++ philosophy/po/philosophy.de-en.html 7 Oct 2012 00:27:50 -0000       1.25
@@ -55,6 +55,7 @@
   Richard Stallman</a></li>
   <li><a href="/philosophy/open-source-misses-the-point.html">Why
        "Open Source" misses the point of Free Software</a></li>
+ <li><a 
href="/philosophy/when_free_software_isnt_practically_better.html">When Free 
Software Isn't (Practically) Better</a></li>
   <li><a href="/philosophy/government-free-software.html">Measures governments 
can use to promote free software</a></li>       
 </ul>
 
@@ -106,7 +107,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/27 16:55:44 $
+$Date: 2012/10/07 00:27:50 $
 <!-- timestamp end -->
 </p>
 </div>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]