web-translators-pl
[Top][All Lists]
Advanced

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

[gnu-pl] wwwgnudiff - raport nr 84


From: Wojciech Kotwica
Subject: [gnu-pl] wwwgnudiff - raport nr 84
Date: Tue, 10 Jun 2003 05:13:22 +0200

--- prev/licenses/license-list.html     Fri Apr  4 05:12:44 2003
+++ curr/./licenses/license-list.html   Tue Jun 10 05:12:26 2003
@@ -456,4 +456,19 @@
 <P>
 
+<DT><A NAME="OpenSSL" HREF="http://www.sdisw.com/openssl.htm";>The
+OpenSSL license</A>.
+
+<DD>The license of OpenSSL is a conjunction of two licenses, One of
+them being the license of SSLeay.  You must follow both.  The
+combination results in a copyleft free software license that is
+incompatible with the GNU GPL.  It also has an advertising clause
+like the original BSD license and the Apache license.
+
+<P>We recommend using GNUTLS instead of OpenSSL in software you write.
+However, there is no reason not to OpenSSL and applications that work
+with OpenSSL.
+
+<P>
+
 <DT><A HREF="http://opensource.org/licenses/academic.php";> The
 Academic Free License, version 1.1</A>.
@@ -1311,5 +1326,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2003/04/03 23:16:49 $ $Author: rms $
+$Date: 2003/06/09 23:25:57 $ $Author: rms $
 <!-- timestamp end -->
 <HR>
--- prev/philosophy/no-word-attachments.html    Tue Feb 18 05:12:49 2003
+++ curr/./philosophy/no-word-attachments.html  Tue Jun 10 05:12:52 2003
@@ -24,5 +24,6 @@
 <!-- Please keep this list alphabetical -->
 <!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-  <A HREF="/philosophy/no-word-attachments.cs.html">Czech</A>
+<A HREF="/philosophy/no-word-attachments.bs.html">Bosnian</A>
+| <A HREF="/philosophy/no-word-attachments.cs.html">Czech</A>
 | <A HREF="/philosophy/no-word-attachments.html">English</A>
 | <A HREF="/philosophy/no-word-attachments.fr.html">French</A>
@@ -312,5 +313,6 @@
 <!-- Please keep this list alphabetical -->
 <!-- PLEASE UPDATE THE LIST AT THE BOTTOM (OR TOP) OF THE PAGE TOO! -->
-  <A HREF="/philosophy/no-word-attachments.cs.html">Czech</A>
+<A HREF="/philosophy/no-word-attachments.bs.html">Bosnian</A>
+| <A HREF="/philosophy/no-word-attachments.cs.html">Czech</A>
 | <A HREF="/philosophy/no-word-attachments.html">English</A>
 | <A HREF="/philosophy/no-word-attachments.fr.html">French</A>
@@ -347,5 +349,5 @@
 Last updated:
 <!-- timestamp start -->
-$Date: 2003/02/17 20:08:25 $ $Author: gurhanozen $
+$Date: 2003/06/08 11:51:22 $ $Author: alensar9865 $
 <!-- timestamp end -->
 <HR>
--- prev/philosophy/words-to-avoid.html Wed Mar  5 05:13:16 2003
+++ curr/./philosophy/words-to-avoid.html       Tue Jun 10 05:12:59 2003
@@ -97,5 +97,7 @@
 are careful to avoid usage that would encourage people to lump us in
 with them.  Therefore, we avoid describing non-free software as
-``closed''.  We call it ``non-free'' or ``proprietary''.
+``closed''.  We call it ``non-free'' or <A
+HREF="http://www.gnu.org/philosophy/categories.html#ProprietarySoftware";>
+``proprietary''</A>.
 <P>
 
@@ -175,5 +177,6 @@
 the authors' moral stature above that of ordinary people, to justify
 increased copyright power that the publishers can exercise in the name
-of the authors.
+of the authors.  We recommend saying ``author'' instead.  However, in
+many cases ``copyright holder'' is what you really mean.
 <P>
 
@@ -184,5 +187,5 @@
 this term is propaganda, designed to lead you unawares into seeing
 the issue from the viewpoint of the few that impose the restrictions,
-while ignoring that of the many whom the restrictions are imposed on.
+while ignoring that of the many on whom the restrictions are imposed.
 <P>
 
@@ -234,6 +237,6 @@
   <LI>Slovak : slobodny' softve'r
   <LI>Slovenian: prosto programje
-  <LI>Spanish : Software [programa] libre
-  <LI>Swedish: fri programvara
+  <LI>Spanish : software [programa] libre
+  <LI>Swedish: fri mjukvara
   <LI>Tamil: Viduthalai
   <LI>Turkish : &#245;zg&#252;r yazilim
@@ -367,6 +370,7 @@
 you can say, ``Copyright lasts a very long time.''
 <P>
-If you want to criticize copyright instead of supporting it,
-you can use the term ``copyright restrictions.''
+If you want to criticize copyright instead of supporting it, you can
+use the term ``copyright restrictions.''  So you can say, ``Copyright
+restrictions last a very long time.''
 <P>
 <H4>``<A HREF="words-to-avoid.html#TOCRAND"
@@ -445,5 +449,6 @@
 includes some free software packages.  However, many programs are
 developed by individual volunteers, or by organizations, which do not
-intend to sell copies.  Their developers are not vendors.
+intend to sell copies.  Their developers are not vendors.  Likewise,
+only some of the developers of GNU/Linux distributions are vendors.
 
 <HR>
@@ -483,5 +488,5 @@
 Updated:
 <!-- hhmts start -->
-$Date: 2003/03/04 14:54:02 $ $Author: rms $
+$Date: 2003/06/09 23:16:44 $ $Author: rms $
 <!-- hhmts end -->
 <HR>




reply via email to

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