[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy categories.ca.html categories.cs...
|
From: |
GNUN |
|
Subject: |
www/philosophy categories.ca.html categories.cs... |
|
Date: |
Mon, 02 Nov 2015 14:57:47 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/11/02 14:57:47
Modified files:
philosophy : categories.ca.html categories.cs.html
philosophy/po : categories.ca-diff.html categories.cs-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ca.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.cs.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ca-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.cs-diff.html?cvsroot=www&r1=1.8&r2=1.9
Patches:
Index: categories.ca.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ca.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- categories.ca.html 5 Jun 2014 15:32:09 -0000 1.44
+++ categories.ca.html 2 Nov 2015 14:57:46 -0000 1.45
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/categories.ca.po">
+ http://www.gnu.org/philosophy/po/categories.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-09-03" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
<!--#include virtual="/server/header.ca.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
<h2>Categories de programari lliure i no lliure</h2>
<p>Vegeu també <a href="/philosophy/words-to-avoid.ca.html">Paraules confuses
@@ -451,7 +457,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2014/06/05 15:32:09 $
+$Date: 2015/11/02 14:57:46 $
<!-- timestamp end -->
</p>
Index: categories.cs.html
===================================================================
RCS file: /web/www/www/philosophy/categories.cs.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- categories.cs.html 21 Dec 2014 11:59:23 -0000 1.18
+++ categories.cs.html 2 Nov 2015 14:57:46 -0000 1.19
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/categories.cs.po">
+ http://www.gnu.org/philosophy/po/categories.cs.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/categories.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/categories.cs-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-09-03" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/categories.en.html" -->
<!--#include virtual="/server/header.cs.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.cs.html" -->
+<!--#include virtual="/server/outdated.cs.html" -->
<h2>Kategorie svobodného a nesvobodného softwaru</h2>
<p>Také si pÅeÄtÄte <a href="/philosophy/words-to-avoid.html">MatoucÃ
slova,
@@ -403,7 +409,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizováno:
-$Date: 2014/12/21 11:59:23 $
+$Date: 2015/11/02 14:57:46 $
<!-- timestamp end -->
</p>
Index: po/categories.ca-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ca-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/categories.ca-diff.html 4 Jun 2014 00:29:36 -0000 1.8
+++ po/categories.ca-diff.html 2 Nov 2015 14:57:46 -0000 1.9
@@ -11,7 +11,7 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: <span
class="removed"><del><strong>1.76</strong></del></span> <span
class="inserted"><ins><em>1.77</em></ins></span> -->
+<!-- Parent-Version: 1.77 -->
<title>Categories of Free and Nonfree Software
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/categories.translist" -->
@@ -185,10 +185,12 @@
product.</p>
<p>The <a href="http://www.x.org">X Window System</a>
- illustrates this. The X Consortium releases X11 with
- distribution terms that make it noncopylefted free
- software. If you wish, you can get a copy which has those
- distribution terms and is free. However, there are nonfree
+ illustrates this. The X Consortium <span
class="removed"><del><strong>releases</strong></del></span> <span
class="inserted"><ins><em>released</em></ins></span> X11 with
+ distribution terms that <span
class="removed"><del><strong>make</strong></del></span> <span
class="inserted"><ins><em>made</em></ins></span> it noncopylefted free
+ <span class="removed"><del><strong>software. If you wish, you can get
a</strong></del></span>
+ <span class="inserted"><ins><em>software, and subsequent developers
have mostly followed the
+ same practice. A</em></ins></span> copy which has those
+ distribution terms <span
class="removed"><del><strong>and</strong></del></span> is <span
class="removed"><del><strong>free.</strong></del></span> <span
class="inserted"><ins><em>free software.</em></ins></span> However, there are
nonfree
versions as well, and there are (or at least were) popular
workstations and PC graphics boards for which nonfree
versions are the only ones that work. If you are using this
@@ -441,20 +443,19 @@
information on coordinating and submitting translations of this
article.</p>
</div>
-<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, <span
class="removed"><del><strong>2010</strong></del></span> <span
class="inserted"><ins><em>2010, 2014</em></ins></span> Free
+<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010,
<span class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<span
class="removed"><del><strong><p></p><p</strong></del></span>
-
-<span class="inserted"><ins><em><p</em></ins></span>
class="unprintable">Updated:
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/06/04 00:29:36 $
+$Date: 2015/11/02 14:57:46 $
<!-- timestamp end -->
</p>
</div>
Index: po/categories.cs-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.cs-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/categories.cs-diff.html 12 Apr 2014 13:58:29 -0000 1.8
+++ po/categories.cs-diff.html 2 Nov 2015 14:57:47 -0000 1.9
@@ -11,9 +11,9 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.77
--></em></ins></span>
+<!-- Parent-Version: 1.77 -->
<title>Categories of Free and Nonfree Software
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+- GNU Project - Free Software Foundation</title>
<!--#include virtual="/philosophy/po/categories.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>Categories of free and nonfree software</h2>
@@ -185,10 +185,12 @@
product.</p>
<p>The <a href="http://www.x.org">X Window System</a>
- illustrates this. The X Consortium releases X11 with
- distribution terms that make it noncopylefted free
- software. If you wish, you can get a copy which has those
- distribution terms and is free. However, there are nonfree
+ illustrates this. The X Consortium <span
class="removed"><del><strong>releases</strong></del></span> <span
class="inserted"><ins><em>released</em></ins></span> X11 with
+ distribution terms that <span
class="removed"><del><strong>make</strong></del></span> <span
class="inserted"><ins><em>made</em></ins></span> it noncopylefted free
+ <span class="removed"><del><strong>software. If you wish, you can get
a</strong></del></span>
+ <span class="inserted"><ins><em>software, and subsequent developers
have mostly followed the
+ same practice. A</em></ins></span> copy which has those
+ distribution terms <span
class="removed"><del><strong>and</strong></del></span> is <span
class="removed"><del><strong>free.</strong></del></span> <span
class="inserted"><ins><em>free software.</em></ins></span> However, there are
nonfree
versions as well, and there are (or at least were) popular
workstations and PC graphics boards for which nonfree
versions are the only ones that work. If you are using this
@@ -263,8 +265,7 @@
Directory</a> identifies all GNU packages.</p>
<p>Most GNU software is <a href=
- <span
class="removed"><del><strong>"/copyleft/copyleft.html">copylefted</a>
,</strong></del></span>
- <span
class="inserted"><ins><em>"/copyleft/copyleft.html">copylefted</a>,</em></ins></span>
but not all; however,
+ "/copyleft/copyleft.html">copylefted</a>, but not all; however,
all GNU software must be <a href="/philosophy/free-sw.html">free
software</a>.</p>
@@ -416,21 +417,13 @@
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
+<div class="unprintable">
-<span class="removed"><del><strong><p>
-Please</strong></del></span>
-<span class="inserted"><ins><em><div class="unprintable">
-
-<p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> FSF & GNU inquiries to
<a
+<p>Please send general FSF & GNU inquiries to <a
href="mailto:address@hidden"><address@hidden></a>. There are
also <a
-href="/contact/">other ways to contact</a> the FSF.
-<span class="removed"><del><strong><br />
-Please send broken</strong></del></span> <span
class="inserted"><ins><em>Broken</em></ins></span> links and other
-corrections or suggestions <span class="inserted"><ins><em>can be
sent</em></ins></span> to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><address@hidden></a>.
-</p>
-
-<p></strong></del></span>
-<span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</p>
+href="/contact/">other ways to contact</a> the FSF. Broken links and
other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden"><address@hidden></a>.</p>
<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
@@ -444,32 +437,25 @@
<p>For information on coordinating and submitting translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
- README</a>. --></em></ins></span>
+ README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for
-information on coordinating and submitting translations of this <span
class="removed"><del><strong>article.
-</p>
-
-<p>
-Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+information on coordinating and submitting translations of this
article.</p>
</div>
-<p>Copyright</em></ins></span> © 1996, 1997, 1998, 2001, 2006,
2007, 2009, <span class="removed"><del><strong>2010</strong></del></span> <span
class="inserted"><ins><em>2010, 2014</em></ins></span> Free
-Software Foundation, <span class="removed"><del><strong>Inc.
-</p></strong></del></span> <span
class="inserted"><ins><em>Inc.</p></em></ins></span>
+<p>Copyright © 1996, 1997, 1998, 2001, 2006, 2007, 2009, 2010,
<span class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free
+Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States <span
class="removed"><del><strong>License</a>.
-</p></strong></del></span> <span
class="inserted"><ins><em>License</a>.</p></em></ins></span>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
-<span class="removed"><del><strong><p>Updated:</strong></del></span>
-
-<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:58:29 $
+$Date: 2015/11/02 14:57:47 $
<!-- timestamp end -->
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy categories.ca.html categories.cs...,
GNUN <=