www-commits
[Top][All Lists]
Advanced

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

www/philosophy philosophy.pl.html proprietary.p...


From: GNUN
Subject: www/philosophy philosophy.pl.html proprietary.p...
Date: Tue, 14 Jan 2014 06:03:53 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/01/14 06:03:53

Modified files:
        philosophy     : philosophy.pl.html proprietary.pl.html 
                         protecting.pl.html the-danger-of-ebooks.pl.html 
                         university.pl.html 
        philosophy/po  : philosophy.pl-en.html proprietary.pl-en.html 
                         protecting.pl-en.html 
                         the-danger-of-ebooks.pl-en.html 
                         university.pl-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/philosophy.pl.html?cvsroot=www&r1=1.194&r2=1.195
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/proprietary.pl.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/protecting.pl.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/the-danger-of-ebooks.pl.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/university.pl.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.pl-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/proprietary.pl-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/protecting.pl-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/the-danger-of-ebooks.pl-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/university.pl-en.html?cvsroot=www&r1=1.19&r2=1.20

Patches:
Index: philosophy.pl.html
===================================================================
RCS file: /web/www/www/philosophy/philosophy.pl.html,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- philosophy.pl.html  31 Aug 2013 20:12:29 -0000      1.194
+++ philosophy.pl.html  14 Jan 2014 06:03:52 -0000      1.195
@@ -53,9 +53,11 @@
 <!-- from philosophy.fr.html and the original documents. -mhatta -->
 <ul>
   <li><a href="/philosophy/free-sw.html">Czym jest Wolne 
Oprogramowanie?</a></li>
+  <li><a href="/philosophy/free-software-even-more-important.html">Dlaczego 
musimy
+nalegać na&nbsp;wolne oprogramowanie</a></li>
+  <li><a href="/philosophy/proprietary.html">Oprogramowanie własnościowe jest
+często szkodliwe</a></li>
   <li><a href="/gnu/gnu.html">Historia GNU/Linuksa</a></li>
-  <li><a href="/philosophy/why-free.html">Dlaczego oprogramowanie nie powinno 
mieć
-właścicieli</a></li>
   <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatyczny 
Idealizm</a></li>
   <li><a href="/philosophy/free-doc.html">Wolne oprogramowanie i&nbsp;wolna
 dokumentacja</a></li>
@@ -72,6 +74,7 @@
 wolne oprogramowanie nie jest (w praktyce) lepsze</a></li>
   <li><a href="/philosophy/government-free-software.html">Co mogą rządy 
robić
 aby&nbsp;promować wolne oprogramowanie</a></li>       
+  <li><a href="/education/education.html">Wolne oprogramowanie 
w&nbsp;edukacji</a></li>
 </ul>
 
 <p>
@@ -157,14 +160,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-Tłumaczenie: Jan Owoc 2010, 2012; poprawki: Jan Wieremjewicz 2010, Oskar
-Gałecki 2010, Jan Owoc 2011, 2012, 2013.</div>
+Tłumaczenie: Jan Owoc 2010, 2012, 2014; poprawki: Jan Wieremjewicz 2010,
+Oskar Gałecki 2010, Jan Owoc 2011, 2012, 2013.</div>
 
 
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2013/08/31 20:12:29 $
+$Date: 2014/01/14 06:03:52 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary.pl.html
===================================================================
RCS file: /web/www/www/philosophy/proprietary.pl.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- proprietary.pl.html 16 Oct 2013 02:59:20 -0000      1.1
+++ proprietary.pl.html 14 Jan 2014 06:03:52 -0000      1.2
@@ -16,10 +16,14 @@
 <p>Oprogramowanie prawnie zastrzeżone, oprogramowanie niewolne, to
 oprogramowanie, które nie szanuje wolności użytkowników
 i&nbsp;społeczności. Autor lub&nbsp;właściciel ma władzę nad&nbsp;jego
-użytkownikami. Samo w&nbsp;sobie to jest niesprawiedliwe, ale&nbsp;prowadzi
-do&nbsp;jeszcze większej niesprawiedliwości. Władza deprawuje,
-więc&nbsp;właściciel programu często wykorzystuje ją, by zrobić 
użytkownikom
-więcej paskudnych rzeczy.</p>
+użytkownikami. Samo w&nbsp;sobie to jest niesprawiedliwe, ale&nbsp;często
+prowadzi do&nbsp;jeszcze większej niesprawiedliwości.</p>
+
+<p>Władza deprawuje, więc&nbsp;właściciel programu często jest kuszony
+aby&nbsp;umieścić szkodliwe funkcje w&nbsp;programie&nbsp;&ndash; to znaczy,
+zrobić z&nbsp;niego <em>malware</em>. Malware to oprogramowanie, które
+lekceważy użytkownika. Ta strona opisuje szeroko używanie niewolne
+oprogramowanie, które wiemy że&nbsp;jest malware.</p>
 
 <ul>
 <li><a href="/philosophy/proprietary-back-doors.html">Prawnie zastrzeżone 
tylne
@@ -37,8 +41,9 @@
 <p>Aby&nbsp;uniknąć tych form nadużyć, należy domagać się <a
 href="/philosophy/free-sw.html">wolnego (respektującego wolność)
 oprogramowania</a>. Ponieważ&nbsp;wolne oprogramowanie jest kontrolowane
-przez jego użytkowników, mają oni szansę aby&nbsp;bronić siebie
-i&nbsp;innych przed złośliwym działaniem oprogramowania.</p>
+przez jego użytkowników, mają oni dobrą ochronę przeciwko złośliwym
+działaniem oprogramowania. Użytkownicy oprogramowania własnościowego są
+bezbronni.</p>
 
 
 <div style="font-size: small;">
@@ -111,13 +116,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-Tłumaczenie: Agnieszka Sznajder 2013; poprawki: Jan Owoc 2013.</div>
+Tłumaczenie: Jan Owoc 2014, Agnieszka Sznajder 2013; poprawki: Jan Owoc
+2013.</div>
 
 
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2013/10/16 02:59:20 $
+$Date: 2014/01/14 06:03:52 $
 
 <!-- timestamp end -->
 </p>

Index: protecting.pl.html
===================================================================
RCS file: /web/www/www/philosophy/protecting.pl.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- protecting.pl.html  31 Aug 2013 20:12:32 -0000      1.34
+++ protecting.pl.html  14 Jan 2014 06:03:52 -0000      1.35
@@ -15,6 +15,12 @@
 <h2>Pomóżcie chronić prawo do&nbsp;pisania programów, bez&nbsp;względu
 na&nbsp;to, czy&nbsp;są wolne czy&nbsp;nie</h2>
 
+<blockquote><p>
+League for Programming Freedom jest obecnie nieaktywna. Przyłączcie się
+do&nbsp;kampanii <a href="http://endsoftpatents.org";>End Software
+Patents</a>!
+</p></blockquote>
+
 <p>
 Prawo do&nbsp;pisania programów, zarówno niewolnych, jak i&nbsp;wolnych,
 jest zagrożone przez <a
@@ -98,7 +104,8 @@
 href="/server/standards/README.translations.html">tłumaczeń</a>.</p>
 
 <p>
-Copyright &copy; 1996, 1997, 1998, 2007, 2008 Free Software Foundation, Inc.
+Copyright &copy; 1996, 1997, 1998, 2007, 2008, 2013 Free Software
+Foundation, Inc.
 </p>
 
 <p>Ten utwór objęty jest licencją Creative Commons Uznanie autorstwa-Bez
@@ -113,14 +120,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-Tłumaczenie: Wojciech Kotwica 2002, poprawki: Wojciech Kotwica 2002, 2003,
-2005, Mariusz Libera 2010, Jan Owoc 2010.</div>
+Tłumaczenie: Wojciech Kotwica 2002, Jan Owoc 2014, poprawki: Wojciech
+Kotwica 2002, 2003, 2005, Mariusz Libera 2010, Jan Owoc 2010.</div>
 
 
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2013/08/31 20:12:32 $
+$Date: 2014/01/14 06:03:52 $
 
 <!-- timestamp end -->
 </p>

Index: the-danger-of-ebooks.pl.html
===================================================================
RCS file: /web/www/www/philosophy/the-danger-of-ebooks.pl.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- the-danger-of-ebooks.pl.html        13 Dec 2013 05:31:23 -0000      1.24
+++ the-danger-of-ebooks.pl.html        14 Jan 2014 06:03:52 -0000      1.25
@@ -1,7 +1,7 @@
 
 
-<!-- Parent-Version: 1.57 -->
 <!--#include virtual="/server/header.pl.html" -->
+<!-- Parent-Version: 1.75 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
  <!--#set var="ENGLISH_PAGE" value="/philosophy/the-danger-of-ebooks.en.html" 
-->
@@ -10,13 +10,6 @@
 
 <!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
-<!--#set var="PO_FILE"
- value='<a href="http://www.gnu.org/philosophy/po/the-danger-of-ebooks.pl.po";>
- http://www.gnu.org/philosophy/po/the-danger-of-ebooks.pl.po</a>' -->
- <!--#set var="ORIGINAL_FILE" value="/philosophy/the-danger-of-ebooks.html" -->
- <!--#set var="DIFF_FILE" 
value="/philosophy/po/the-danger-of-ebooks.pl-diff.html" -->
- <!--#set var="OUTDATED_SINCE" value="2013-10-14" -->
- <!--#include virtual="/server/outdated.pl.html" -->
 <h2>Niebezpieczeństwo e-booków</h2>
 
 <div style="text-align: center; font-size: 110%;text-shadow: 0 0 0.2em #fff; 
width: 300px; float: right; margin: 12px; background-color: #a0f112; color: 
#353831; padding: 1em;"><a 
href="http://defectivebydesign.org/ebooks.html";>Zapiszcie się
@@ -91,12 +84,7 @@
 <p>Przyłączcie się do&nbsp;walki: zapiszcie się na&nbsp;stronie <a
 
href="http://DefectiveByDesign.org/ebooks.html";>http://DefectiveByDesign.org/ebooks.html</a>.</p>
 
-<!-- If needed, change the copyright block at the bottom. In general,
-     all pages on the GNU web server should have the section about
-     verbatim copying.  Please do NOT remove this without talking
-     with the webmasters first.
-     Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". -->
+
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -109,12 +97,27 @@
 
 <p>Pytania dotyczące GNU i&nbsp;FSF prosimy kierować na&nbsp;adres <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Istnieją także <a
-href="/contact/contact.html">inne sposoby skontaktowania się</a> 
z&nbsp;FSF.<br />
-Informacje o&nbsp;niedziałających odnośnikach oraz&nbsp;inne poprawki (lub
-propozycje) prosimy wysyłać na&nbsp;adres <a
+href="/contact/contact.html">inne sposoby skontaktowania się</a>
+z&nbsp;FSF. <br /> Informacje o niedziałających odnośnikach oraz&nbsp;inne
+poprawki (lub propozycje) prosimy wysyłać na&nbsp;adres <a
 href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości,
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Staramy się, aby&nbsp;tłumaczenia były wierne i&nbsp;wysokiej jakości,
 ale&nbsp;nie jesteśmy zwolnieni z&nbsp;niedoskonałości. Komentarze odnośnie
 tłumaczenia polskiego oraz&nbsp;zgłoszenia dotyczące chęci współpracy
 w&nbsp;tłumaczeniu prosimy kierować na&nbsp;adres <a
@@ -123,6 +126,22 @@
 i&nbsp;koordynowania tłumaczeń artykułów, proszę odwiedzić stronę <a
 href="/server/standards/README.translations.html">tłumaczeń</a>.</p>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 2011 Richard Stallman</p>
 
 <p>Ten utwór objęty jest licencją Creative Commons Uznanie autorstwa-Bez
@@ -143,12 +162,11 @@
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2013/12/13 05:31:23 $
+$Date: 2014/01/14 06:03:52 $
 
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: university.pl.html
===================================================================
RCS file: /web/www/www/philosophy/university.pl.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- university.pl.html  31 Aug 2013 20:12:44 -0000      1.39
+++ university.pl.html  14 Jan 2014 06:03:52 -0000      1.40
@@ -83,6 +83,12 @@
 że&nbsp;jedyny wybór to albo&nbsp;mieć pakiet wolnego oprogramowania, który
 przyniesie uznanie uczelni, albo&nbsp;nie mieć w&nbsp;ogóle nic, przeważnie
 wybierają pierwsze wyjście.</p>
+<p>
+FSF czasami jest w&nbsp;stanie przekonać Waszą uczelnię, aby&nbsp;przyjęła
+warunki licencji GNU General Public License, lub&nbsp;aby zaakceptowali
+wersji 3 GPL. Jeśli nie potraficie zrobić tego sami, prosimy dać nam szansę
+pomóc. Wyślijcie maila na&nbsp;adres address@hidden i&nbsp;umieścście
+&bdquo;urgent&rdquo; w&nbsp;polu Temat.</p>
 
 <p>
 Nie wszystkie uczelnie prowadzą tak zachłanna
@@ -97,12 +103,11 @@
 ludzkiej wiedzy, czy&nbsp;jego jedynym celem jest przetrwanie?</p>
 
 <p>
-Bez&nbsp;względu na&nbsp;to, jakie podejście zastosujecie, pomocna jest
-determinacja i&nbsp;patrzenie na&nbsp;sprawę z&nbsp;etycznego punktu
-widzenia, tak jak robimy to w&nbsp;Ruchu Wolnego
-Oprogramowania. Aby&nbsp;traktować społeczeństwo w&nbsp;sposób etyczny,
-oprogramowanie powinno być wolne&nbsp;&ndash; w&nbsp;sensie
-wolności&nbsp;&ndash; dla całego społeczeństwa.</p>
+Przekonując uczelnię, pomocna jest determinacja i&nbsp;patrzenie
+na&nbsp;sprawę z&nbsp;etycznego punktu widzenia, tak jak robimy to
+w&nbsp;Ruchu Wolnego Oprogramowania. Aby&nbsp;traktować społeczeństwo
+w&nbsp;sposób etyczny, oprogramowanie powinno być wolne&nbsp;&ndash;
+w&nbsp;sensie wolności&nbsp;&ndash; dla całego społeczeństwa.</p>
 
 <p>
 Wielu konstruktorów wolnego oprogramowania głosi zawężone, czysto 
praktyczne
@@ -202,14 +207,14 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-Tłumaczenie: Wojciech Kotwica 2002, 2003, 2006; poprawki: Daniel Oźminkowski
-2010, Jan Owoc 2010, 2013.</div>
+Tłumaczenie: Wojciech Kotwica 2002, 2003, 2006, Jan Owoc 2014; poprawki:
+Daniel Oźminkowski 2010, Jan Owoc 2010, 2013.</div>
 
 
  <p><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2013/08/31 20:12:44 $
+$Date: 2014/01/14 06:03:52 $
 
 <!-- timestamp end -->
 </p>

Index: po/philosophy.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.pl-en.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- po/philosophy.pl-en.html    5 Jul 2013 13:58:37 -0000       1.22
+++ po/philosophy.pl-en.html    14 Jan 2014 06:03:53 -0000      1.23
@@ -48,9 +48,11 @@
 
 <ul>
   <li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
+  <li><a href="/philosophy/free-software-even-more-important.html">
+      Why we must insist on free software</a></li>
+  <li><a href="/philosophy/proprietary.html">
+      Proprietary software is often malware</a></li>
   <li><a href="/gnu/gnu.html">History of GNU/Linux</a></li>
-  <li><a href="/philosophy/why-free.html">Why
-       Software Should Not Have Owners</a></li>
   <li><a href="/philosophy/pragmatic.html">Copyleft: Pragmatic 
Idealism</a></li>
   <li><a href="/philosophy/free-doc.html">Why Free Software Needs
       Free Documentation</a></li>
@@ -63,6 +65,7 @@
        "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>       
+  <li><a href="/education/education.html">Free software in education</a></li>
 </ul>
 
 <p>
@@ -132,7 +135,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/07/05 13:58:37 $
+$Date: 2014/01/14 06:03:53 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/proprietary.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/proprietary.pl-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/proprietary.pl-en.html   16 Oct 2013 02:59:21 -0000      1.1
+++ po/proprietary.pl-en.html   14 Jan 2014 06:03:53 -0000      1.2
@@ -8,9 +8,14 @@
 
 <p>Proprietary software, nonfree software, is software that doesn't
 respect users' freedom and community.  The developer or owner has
-power over its users.  That in itself is an injustice, but it leads to
-more injustice.  Power corrupts, so the program's owner often takes
-advantage of it to do further nasty things to the users.</p>
+power over its users.  That in itself is an injustice, but it often
+leads to further injustice.</p>
+
+<p>Power corrupts, so the program's owner is tempted to put malicious
+functionality into the program &mdash; that is, to make
+it <em>malware</em>.  Malware means software whose functioning
+mistreats the user.  This page gives examples of widely used
+proprietary programs that are known to be malware.</p>
 
 <ul>
 <li><a href="/philosophy/proprietary-back-doors.html">Proprietary back
@@ -26,9 +31,10 @@
 </ul>
 
 <p>The way to avoid these forms of abuse is by insisting on
-<a href="/philosophy/free-sw.html">free (freedom-respecting) software.</a>  
Since
-free software is controlled by its users, they have a chance to defend
-themselves and each other against malicious software functions.</p>
+<a href="/philosophy/free-sw.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>
 
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
@@ -85,7 +91,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/10/16 02:59:21 $
+$Date: 2014/01/14 06:03:53 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/protecting.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/protecting.pl-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/protecting.pl-en.html    29 Apr 2013 18:59:02 -0000      1.15
+++ po/protecting.pl-en.html    14 Jan 2014 06:03:53 -0000      1.16
@@ -6,10 +6,16 @@
 <!--#include virtual="/philosophy/po/protecting.translist" -->
 <!--#include virtual="/server/banner.html" -->
 
-<h2>Help Protect the Rights to Write Both Non-Free and Free Software</h2>
+<h2>Help Protect the Rights to Write Both Nonfree and Free Software</h2>
+
+<blockquote><p>
+The League for Programming Freedom is inactive now.  Please join
+our <a href="http://endsoftpatents.org";>End Software Patents</a>
+campaign!
+</p></blockquote>
 
 <p>
-The right to write both non-free and free software is threatened by
+The right to write both nonfree and free software is threatened by
 <a href="http://progfree.org/Patents/patents.html";>software patents</a>
 and by
 <a 
href="http://progfree.org/Copyright/copyright.html";>&ldquo;look-and-feel&rdquo;
@@ -74,7 +80,8 @@
 of this article.</p>
 
 <p>
-Copyright &copy; 1996, 1997, 1998, 2007, 2008 Free Software Foundation, Inc.
+Copyright &copy; 1996, 1997, 1998, 2007, 2008, 2013
+Free Software Foundation, Inc.
 </p>
 
 <p>This page is licensed under a <a rel="license"
@@ -86,7 +93,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/04/29 18:59:02 $
+$Date: 2014/01/14 06:03:53 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/the-danger-of-ebooks.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/the-danger-of-ebooks.pl-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/the-danger-of-ebooks.pl-en.html  28 Feb 2013 19:13:09 -0000      1.16
+++ po/the-danger-of-ebooks.pl-en.html  14 Jan 2014 06:03:53 -0000      1.17
@@ -1,5 +1,5 @@
-<!-- Parent-Version: 1.57 -->
 <!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.75 -->
 <title>The Danger of E-Books
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/the-danger-of-ebooks.translist" -->
@@ -35,7 +35,7 @@
 e-book.</li>
 <li>The format is secret, and only proprietary user-restricting software can 
 read it at all.</li>
-<li>An ersatz "lending" is allowed for some books, for a limited time, but 
+<li>An ersatz &ldquo;lending&rdquo; is allowed for some books, for a limited 
time, but
 only by specifying by name another user of the same system. No giving or 
 selling.</li>
 <li>To copy the e-book is impossible due to 
@@ -71,12 +71,6 @@
 at <a href="http://DefectiveByDesign.org/ebooks.html";>
 http://DefectiveByDesign.org/ebooks.html</a>.</p>
 
-<!-- If needed, change the copyright block at the bottom. In general,
-     all pages on the GNU web server should have the section about
-     verbatim copying.  Please do NOT remove this without talking
-     with the webmasters first.
-     Please make sure the copyright date is consistent with the document
-     and that it is like this: "2001, 2002", not this: "2001-2002". -->
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -84,15 +78,44 @@
 <p>Please send general FSF &amp; GNU inquiries to
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
 There are also <a href="/contact/">other ways to contact</a>
-the FSF.<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
 
-<p>Please see the <a
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
 href="/server/standards/README.translations.html">Translations
 README</a> for information on coordinating and submitting translations
 of this article.</p>
 
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
 <p>Copyright &copy; 2011 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -103,11 +126,10 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/02/28 19:13:09 $
+$Date: 2014/01/14 06:03:53 $
 <!-- timestamp end -->
 </p>
 </div>
-
 </div>
 </body>
 </html>

Index: po/university.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/university.pl-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- po/university.pl-en.html    10 Mar 2013 07:18:54 -0000      1.19
+++ po/university.pl-en.html    14 Jan 2014 06:03:53 -0000      1.20
@@ -68,6 +68,12 @@
 administrators know their choice is to have a free software package
 that brings credit to the university or nothing at all, they will
 usually choose the former.</p>
+<p>
+The FSF can sometimes persuade your university to accept the GNU
+General Public License, or to accept GPL version 3.  If you can't do
+it alone, please give us the chance to help.  Send mail to
address@hidden, and put &ldquo;urgent&rdquo; in the Subject
+field.</p>
 
 <p>
 Not all universities have grasping policies.  The University of Texas
@@ -81,11 +87,10 @@
 knowledge, or is its sole purpose to perpetuate itself?</p>
 
 <p>
-Whatever approach you use, it helps to approach the issue with determination
-and based on an
-ethical perspective, as we do in the free software movement.  To treat
-the public ethically, the software should be free&mdash;as in
-freedom&mdash;for the whole public.</p>
+In persuading the university, it helps to approach the issue with
+determination and based on an ethical perspective, as we do in the
+free software movement.  To treat the public ethically, the software
+should be free&mdash;as in freedom&mdash;for the whole public.</p>
 
 <p>
 Many developers of free software profess narrowly practical reasons
@@ -161,7 +166,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/03/10 07:18:54 $
+$Date: 2014/01/14 06:03:53 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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