[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy essays-and-articles.ca.html po/e...
|
From: |
GNUN |
|
Subject: |
www/philosophy essays-and-articles.ca.html po/e... |
|
Date: |
Thu, 09 May 2013 03:28:03 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/05/09 03:28:03
Modified files:
philosophy : essays-and-articles.ca.html
philosophy/po : essays-and-articles.ca-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.ca.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ca-diff.html?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: essays-and-articles.ca.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.ca.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- essays-and-articles.ca.html 28 Feb 2013 19:11:17 -0000 1.28
+++ essays-and-articles.ca.html 9 May 2013 03:28:02 -0000 1.29
@@ -8,6 +8,13 @@
<!--#include virtual="/philosophy/po/essays-and-articles.translist" -->
<!--#include virtual="/server/banner.ca.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/essays-and-articles.ca.po";>
+ http://www.gnu.org/philosophy/po/essays-and-articles.ca.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/essays-and-articles.html" -->
+ <!--#set var="DIFF_FILE"
value="/philosophy/po/essays-and-articles.ca-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2013-03-09" -->
+ <!--#include virtual="/server/outdated.ca.html" -->
<div id="education-content">
<h2>Assaigs i articles</h2>
@@ -539,7 +546,7 @@
<p><!-- timestamp start -->
Updated:
-$Date: 2013/02/28 19:11:17 $
+$Date: 2013/05/09 03:28:02 $
<!-- timestamp end -->
</p>
Index: po/essays-and-articles.ca-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ca-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/essays-and-articles.ca-diff.html 8 Jul 2012 00:30:26 -0000 1.1
+++ po/essays-and-articles.ca-diff.html 9 May 2013 03:28:03 -0000 1.2
@@ -11,9 +11,11 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<title>Essays and Articles - GNU Project - Free Software Foundation
(FSF)</title>
-<!--#include virtual="/server/banner.html" -->
+<span class="inserted"><ins><em><!-- Parent-Version: 1.75
--></em></ins></span>
+<title>Essays and Articles
+- 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>
<!--#include virtual="/philosophy/po/essays-and-articles.translist" -->
+<!--#include virtual="/server/banner.html" -->
<div id="education-content">
<h2>Essays and Articles</h2>
@@ -58,6 +60,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
“Open Source” misses the point of Free
Software</a></li>
<li><a href="/philosophy/linux-gnu-freedom.html">Linux, GNU, and
@@ -130,9 +133,11 @@
<li><a href="/philosophy/freedom-or-power.html"
id="FreedomOrPower">Freedom or Power?</a></li>
<li><a href="/philosophy/no-word-attachments.html"
id="NoWordAttachments">We Can Put an End to Word
Attachments</a></li>
<li><a href="/philosophy/java-trap.html" id="JavaTrap">Free But
- Shackled - The Java Trap</a> (Although as of December 2006 Sun is in
the middle of
- <a
href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html">re-releasing its
Java platform
- under GNU GPL</a>, the issue described in this article still remains
important)</li>
+ Shackled - The Java Trap</a> (Although <span
class="removed"><del><strong>as of December 2006</strong></del></span> Sun
<span class="removed"><del><strong>is in the middle of</strong></del></span>
+ <span class="inserted"><ins><em>has</em></ins></span> <a <span
class="removed"><del><strong>href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html">re-releasing</strong></del></span>
<span
class="inserted"><ins><em>href="http://www.fsf.org/news/fsf-welcomes-gpl-java.html">
+ relicensed</a> most of</em></ins></span> its Java platform <span
class="inserted"><ins><em>reference implementation</em></ins></span>
+ under <span class="inserted"><ins><em>the</em></ins></span> GNU <span
class="removed"><del><strong>GPL</a>,</strong></del></span> <span
class="inserted"><ins><em>General Public License,</em></ins></span> the issue
described in this
+ article still remains important)</li>
<li><a href="/philosophy/fighting-software-patents.html"
id="FightingSoftwarePatents">Fighting Software Patents - Singly and
Together</a></li>
<li><a href="/philosophy/software-literary-patents.html"
id="SoftwareLiteraryPatents">
Software Patents and Literary Patents</a>, by Richard M. Stallman,
@@ -228,10 +233,10 @@
published in Technology Review in 2000,
by <a href="http://www.stallman.org"> Richard
Stallman</a></li>
- <li><a <span
class="inserted"><ins><em>href="/philosophy/ebooks-must-increase-freedom.html">
+ <li><a href="/philosophy/ebooks-must-increase-freedom.html">
Ebooks must increase our freedom, not decrease it</a></li>
- <li><a</em></ins></span>
href="/philosophy/can-you-trust.html">Can you trust your
+ <li><a href="/philosophy/can-you-trust.html">Can you trust your
computer?</a>, a work by <a
href="http://www.stallman.org">Richard
Stallman</a> about the so-called “trusted computing”
initiatives.</li>
@@ -266,6 +271,9 @@
<h4 id="patents">Patents</h4>
<ul>
+ <li><a href="/philosophy/limit-patent-effect.html">Giving the
Software
+ Field Protection from Patents</a></li>
+
<li><a href="/philosophy/w3c-patent.html">FSF's Position on W3
Consortium “Royalty-Free” Patent Policy</a>
rewritten</li>
@@ -333,8 +341,8 @@
<h4 id="cultural">Cultural and Social Issues</h4>
<ul>
- <span class="inserted"><ins><em><li><a
href="/philosophy/nonfree-games.html">Nonfree DRM'd Games on
- GNU/Linux: Good or Bad?</a> by Richard
Stallman</li></em></ins></span>
+ <li><a href="/philosophy/nonfree-games.html">Nonfree DRM'd Games
on
+ GNU/Linux: Good or Bad?</a> by Richard Stallman</li>
<li> <a
href="http://www.guardian.co.uk/technology/blog/2010/apr/06/digital-economy-bill-richard-stallman">Digital
economy bill: One clown giveth and
the other clown taketh away</a> by
<a href="http://www.stallman.org">Richard
Stallman</a></li>
@@ -369,7 +377,7 @@
Stallman (originally published under the title “Second
Sight”).</li>
- <li><a
href="http://www.insnet.org/ins_headlines.rxml?cust=212&id=967">
+ <li><a
href="http://web.archive.org/web/20070806183422/http://www.insnet.org/ins_headlines.rxml?cust=212&id=967">
Free Software and Sustainable Development</a> — A short
article by Richard Stallman regarding the use of proprietary
software in cultural development.</li>
@@ -379,10 +387,13 @@
<h4 id="misc">Misc</h4>
<ul>
- <li><a <span
class="inserted"><ins><em>href="/philosophy/bug-nobody-allowed-to-understand.html">The
+ <li><a href="/philosophy/proprietary-surveillance.html">Clearly
established
+ cases of proprietary software that spies on or tracks
users</a>.</li>
+
+ <li><a
href="/philosophy/bug-nobody-allowed-to-understand.html">The
Bug Nobody is Allowed to Understand</a>, By Richard
Stallman.</li>
- <li><a</em></ins></span>
href="/philosophy/sun-in-night-time.html">The Curious
+ <li><a href="/philosophy/sun-in-night-time.html">The Curious
Incident of Sun in the Night-Time</a>, by Richard M.
Stallman.</li>
<li><a href="http://counterpunch.org/baker08192004.html">Why We
Need
@@ -409,6 +420,10 @@
<li><a href="/philosophy/censoring-emacs.html">Censoring My
Software</a>, by <a href="http://www.stallman.org">Richard
Stallman</a></li>
+
+ <li><a
href="/philosophy/funding-art-vs-funding-software.html">Funding
+ Art vs Funding Software</a>, by <a
href="http://www.stallman.org">Richard
+ Stallman</a></li>
</ul>
<h3 id="terminology">Terminology and Definitions</h3>
@@ -451,97 +466,72 @@
<h3>Links to more philosophy articles</h3>
<ul>
-<li id="Speeches"><a href="speeches-and-interview.html">Speeches
and
+<li id="Speeches"><a <span
class="removed"><del><strong>href="speeches-and-interview.html">Speeches</strong></del></span>
<span
class="inserted"><ins><em>href="/philosophy/speeches-and-interview.html">Speeches</em></ins></span>
and
interviews</a></li>
-<li id="ThirdPartyIdeas"><a href="third-party-ideas.html">Third
party
+<li id="ThirdPartyIdeas"><a <span
class="removed"><del><strong>href="third-party-ideas.html">Third</strong></del></span>
<span
class="inserted"><ins><em>href="/philosophy/third-party-ideas.html">Third</em></ins></span>
party
ideas</a></li>
<li id="Philosophy"><a href="/philosophy/">The main philosophy
page</a></li>
</ul>
-</div>
-
+<span class="removed"><del><strong></div></strong></del></span>
+<span class="inserted"><ins><em></div><!-- for id="content", starts
in the include above --></em></ins></span>
<!--#include virtual="/server/footer.html" -->
-
<div id="footer">
-<p>
-Please send 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.
-<br />
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden"><address@hidden></a>.
+<span class="removed"><del><strong><p>
+Please</strong></del></span>
+
+<span class="inserted"><ins><em><p>Please</em></ins></span> send <span
class="inserted"><ins><em>general</em></ins></span> 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>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
+<p></strong></del></span>
+<span
class="inserted"><ins><em>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:
+
+ 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">
+ <address@hidden></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>. --></em></ins></span>
+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 © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.</p>
+Copyright</strong></del></span> <span
class="inserted"><ins><em>article.</p>
+
+<p>Copyright</em></ins></span> © <span
class="removed"><del><strong>1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004,
+2005, 2006, 2007, 2008, 2009, 2010</strong></del></span> <span
class="inserted"><ins><em>1996-2013</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>
+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>
-<p>
-Updated:
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p>Updated:
<!-- timestamp start -->
-$Date: 2012/07/08 00:30:26 $
+$Date: 2013/05/09 03:28:03 $
<!-- timestamp end -->
</p>
</div>
-<!-- All pages on the GNU web server should have the section about -->
+<span class="removed"><del><strong><!-- 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." -->
-
-<span class="removed"><del><strong><!-- <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"> -->
-<!-- Arabic -->
-<!-- <li><a
href="/philosophy/essays-and-articles.ar.html">العربية</a> [ar]</li>
-->
-<!-- Bulgarian -->
-<!-- <li><a
href="/philosophy/essays-and-articles.bg.html">български</a> [bg]</li>
-->
-<!-- Catalan -->
-<!-- <li><a
href="/philosophy/essays-and-articles.ca.html">català</a> [ca]</li>
-->
-<!-- German -->
-<!-- <li><a
href="/philosophy/essays-and-articles.de.html">Deutsch</a> [de]</li>
-->
-<!-- English -->
-<!-- <li><a
href="/philosophy/essays-and-articles.html">English</a> [en]</li>
-->
-<!-- Spanish -->
-<!-- <li><a
href="/philosophy/essays-and-articles.es.html">español</a> [es]</li>
-->
-<!-- French -->
-<!-- <li><a
href="/philosophy/essays-and-articles.fr.html">français</a> [fr]</li>
-->
-<!-- Polish -->
-<!-- <li><a
href="/philosophy/essays-and-articles.pl.html">polski</a> [pl]</li>
-->
-<!-- Brazilian Portuguese -->
-<!-- <li><a
href="/philosophy/essays-and-articles.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
-<!-- Serbian -->
-<!-- <li><a
href="/philosophy/essays-and-articles.sr.html">српски</a> [sr]</li>
-->
-<!-- </ul> -->
-<!-- </div> --></strong></del></span>
-
+<!-- and that it is like this "2001, 2002" not this "2001-2002."
--></strong></del></span>
</div>
</body>
</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy essays-and-articles.ca.html po/e...,
GNUN <=