[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy microsoft.ca.html po/microsoft.c...
|
From: |
GNUN |
|
Subject: |
www/philosophy microsoft.ca.html po/microsoft.c... |
|
Date: |
Wed, 10 Apr 2013 17:28:59 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/04/10 17:28:59
Modified files:
philosophy : microsoft.ca.html
philosophy/po : microsoft.ca-diff.html microsoft.translist
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft.ca.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft.ca-diff.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft.translist?cvsroot=www&r1=1.8&r2=1.9
Patches:
Index: microsoft.ca.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft.ca.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- microsoft.ca.html 9 Feb 2013 07:48:34 -0000 1.24
+++ microsoft.ca.html 10 Apr 2013 17:28:58 -0000 1.25
@@ -7,6 +7,13 @@
<title>Ãs Microsoft el Papu? - GNU Project - Free Software Foundation
(FSF)</title>
<!--#include virtual="/server/banner.ca.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/philosophy/po/microsoft.ca.po";>
+ http://www.gnu.org/philosophy/po/microsoft.ca.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/philosophy/microsoft.html" -->
+ <!--#set var="DIFF_FILE" value="/philosophy/po/microsoft.ca-diff.html" -->
+ <!--#set var="OUTDATED_SINCE" value="2013-02-09" -->
+ <!--#include virtual="/server/outdated.ca.html" -->
<!--#include virtual="/philosophy/po/microsoft.translist" -->
<h2>Ãs Microsoft el Papu?</h2>
@@ -145,7 +152,7 @@
<p><!-- timestamp start -->
Updated:
-$Date: 2013/02/09 07:48:34 $
+$Date: 2013/04/10 17:28:58 $
<!-- timestamp end -->
</p>
Index: po/microsoft.ca-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft.ca-diff.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- po/microsoft.ca-diff.html 16 Sep 2012 09:25:04 -0000 1.4
+++ po/microsoft.ca-diff.html 10 Apr 2013 17:28:58 -0000 1.5
@@ -11,9 +11,11 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<title>Is Microsoft the Great Satan? - GNU Project - Free Software
Foundation (FSF)</title>
-<!--#include virtual="/server/banner.html" -->
-<!--#include virtual="/philosophy/po/microsoft.translist" -->
+<span class="inserted"><ins><em><!-- Parent-Version: 1.75
--></em></ins></span>
+<title>Is Microsoft the Great Satan?
+- 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 <span
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/philosophy/po/microsoft.translist"</em></ins></span>
-->
+<!--#include <span
class="removed"><del><strong>virtual="/philosophy/po/microsoft.translist"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> -->
<h2>Is Microsoft the Great Satan?</h2>
<div class="announcement">
@@ -72,7 +74,7 @@
in the future. For the most part, the companies' main motivation in
doing these things is to attack each other; now, it seems, we are
specifically targeted. Microsoft is using its patents directly to
-<a <span
class="removed"><del><strong>href="http://press.redhat.com/2009/09/09/microsoft-and-patent-trolls/"></strong></del></span>
<span
class="inserted"><ins><em>href="http://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls"></em></ins></span>
+<a
href="http://www.redhat.com/about/news/archive/2009/9/microsoft-and-patent-trolls">
attack the free software community</a>, and our community is fighting
back.</p>
@@ -107,27 +109,39 @@
But we do recognize it as the company that has separated more users
from their freedom than any other, and a powerful avowed enemy of
computer users' freedom. We act accordingly.</p>
-</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>.
+<p>Please 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>
+<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></strong></del></span> <span
class="inserted"><ins><em>article.</p></em></ins></span>
<p>
Copyright © 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010 Free
@@ -137,14 +151,14 @@
Commons Attribution-NoDerivs 3.0 United States License</a>.
</p>
-<p>
-Updated:
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p>Updated:
<!-- timestamp start -->
-$Date: 2012/09/16 09:25:04 $
+$Date: 2013/04/10 17:28:58 $
<!-- timestamp end -->
</p>
</div>
-
</div>
</body>
</html>
Index: po/microsoft.translist
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft.translist,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/microsoft.translist 1 Mar 2013 04:11:40 -0000 1.8
+++ po/microsoft.translist 10 Apr 2013 17:28:59 -0000 1.9
@@ -2,14 +2,14 @@
<!--#set var="TRANSLATION_LIST"
value='<div id="translations">
<p>
-<span dir="ltr" class="original"><a
href="/philosophy/microsoft.en.html">English</a> [en]</span>
-<span dir="ltr"><a
href="/philosophy/microsoft.ar.html">اÙعربÙØ©</a> [ar]</span>
-<span dir="ltr"><a href="/philosophy/microsoft.ca.html">catalÃ
</a> [ca]</span>
-<span dir="ltr"><a
href="/philosophy/microsoft.de.html">Deutsch</a> [de]</span>
-<span dir="ltr"><a
href="/philosophy/microsoft.fr.html">français</a> [fr]</span>
-<span dir="ltr"><a
href="/philosophy/microsoft.ml.html">മലയാളà´</a> [ml]</span>
-<span dir="ltr"><a
href="/philosophy/microsoft.pl.html">polski</a> [pl]</span>
-<span dir="ltr"><a
href="/philosophy/microsoft.ru.html">ÑÑÑÑкий</a> [ru]</span>
+<span dir="ltr" class="original"><a lang="en" hreflang="en"
href="/philosophy/microsoft.en.html">English</a> [en]</span>
+<span dir="ltr"><a lang="ar" hreflang="ar"
href="/philosophy/microsoft.ar.html">اÙعربÙØ©</a> [ar]</span>
+<span dir="ltr"><a lang="ca" hreflang="ca"
href="/philosophy/microsoft.ca.html">català </a> [ca]</span>
+<span dir="ltr"><a lang="de" hreflang="de"
href="/philosophy/microsoft.de.html">Deutsch</a> [de]</span>
+<span dir="ltr"><a lang="fr" hreflang="fr"
href="/philosophy/microsoft.fr.html">français</a> [fr]</span>
+<span dir="ltr"><a lang="ml" hreflang="ml"
href="/philosophy/microsoft.ml.html">മലയാളà´</a> [ml]</span>
+<span dir="ltr"><a lang="pl" hreflang="pl"
href="/philosophy/microsoft.pl.html">polski</a> [pl]</span>
+<span dir="ltr"><a lang="ru" hreflang="ru"
href="/philosophy/microsoft.ru.html">ÑÑÑÑкий</a> [ru]</span>
</p>
</div>' -->
<!--#if expr="$HTML_BODY = yes" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy microsoft.ca.html po/microsoft.c...,
GNUN <=