www-commits
[Top][All Lists]
Advanced

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

www home.es.html gnu/thegnuproject.ja.html gnu/...


From: Fabio J. Gonzalez
Subject: www home.es.html gnu/thegnuproject.ja.html gnu/...
Date: Sat, 15 Sep 2012 21:29:33 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Fabio J. Gonzalez <gonzalfj>    12/09/15 21:29:33

Modified files:
        .              : home.es.html 
        gnu            : thegnuproject.ja.html thegnuproject.nl.html 
                         thegnuproject.pl.html thegnuproject.ru.html 
                         thegnuproject.sq.html thegnuproject.tr.html 
        gnu/po         : thegnuproject.ja-en.html thegnuproject.nl.po 
                         thegnuproject.pl-en.html 
                         thegnuproject.ru-en.html 
        help           : help.pt-br.html 
        help/po        : help.pt-br.po 
        licenses       : license-list.ru.html 
        licenses/po    : license-list.ru-en.html 
        people         : past-webmasters.de.html past-webmasters.ja.html 
        people/po      : past-webmasters.ja.po 
        philosophy     : right-to-read.it.html right-to-read.ru.html 
        philosophy/po  : right-to-read.it-en.html right-to-read.it.po 
                         right-to-read.ru-en.html right-to-read.ru.po 
        po             : home.es.po 

Log message:
        corrections, problably a conflict

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.es.html?cvsroot=www&r1=1.99&r2=1.100
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.ja.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.nl.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.pl.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.ru.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.sq.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/thegnuproject.tr.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.ja-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.nl.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.pl-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/thegnuproject.ru-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/help/help.pt-br.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/help/po/help.pt-br.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/people/past-webmasters.de.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/people/past-webmasters.ja.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/past-webmasters.ja.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/right-to-read.it.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/right-to-read.ru.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.it-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.it.po?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.ru-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.ru.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.es.po?cvsroot=www&r1=1.246&r2=1.247

Patches:
Index: home.es.html
===================================================================
RCS file: /web/www/www/home.es.html,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- home.es.html        15 Sep 2012 19:34:25 -0000      1.99
+++ home.es.html        15 Sep 2012 21:26:19 -0000      1.100
@@ -3,16 +3,16 @@
 <!--#include virtual="/server/header.es.html" -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
-<title>El sistema operativo GNU</title>
+<title>The GNU Operating System</title>
 
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software,
-sistema operativo, GNU Kernel, núcleo de GNU, HURD, GNU HURD" />
+Operating System, GNU Kernel, GNU Hurd" />
 <meta http-equiv="Description" content="Desde 1983 estamos desarrollando el 
sistema operativo GNU, similar a Unix
 pero libre, para que los usuarios de ordenadores tengan la libertad de
 compartir y mejorar el software que usan." />
 <link rel="alternate" title="Planet GNU" 
href="http://planet.gnu.org/rss20.xml"; type="application/rss+xml" />
-<link rel="alternate" title="Novedades" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" />
-<link rel="alternate" title="Nuevo software libre" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" />
+<link rel="alternate" title="What's New" 
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" />
+<link rel="alternate" title="New Free Software" 
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" />
 
 <!--#include virtual="/server/banner.es.html" -->
 <div class="netscape4">
@@ -26,9 +26,9 @@
 <div class="netscape4" id="skiptrans"></div>
 
 
-<p class="netscape4">Richard Stallman anunció en setiembre de 1983 el plan de 
crear un sistema
-operativo de software libre del tipo Unix llamado GNU. GNU es el único
-sistema operativo creado específicamente para la libertad de los usuarios.</p>
+<p class="netscape4">Richard Stallman announced in September 1983 the plan to 
develop a free
+software Unix-like operating system called GNU. GNU is the only operating
+system developed specifically for the sake of users' freedom.</p>
 
 <div style="width: 630px; height: 200px; margin: 0 auto;">
 <object
@@ -39,38 +39,35 @@
 <div class="yui-g home">
     <div class="yui-u first">
 
-      <h2>¿Qué es GNU?</h2>
+      <h2>What is GNU?</h2>
 
-<p>GNU es un sistema operativo similar a Unix que es <a
-href="/philosophy/free-sw.es.html">software libre</a> y respeta su
-libertad. Puede instalar <a href="/distros/free-distros.es.html">versiones
-de GNU basadas en Linux</a> que son completamente software libre.</p>
+<p>GNU is a Unix-like operating system that is <a
+href="/philosophy/free-sw.html">free software</a>&mdash;it respects your
+freedom.  You can install <a href="/distros/free-distros.html">Linux-based
+versions of GNU</a> which are entirely free software.</p>
 
 <p class="c"><a href="/distros/screenshot.html"><img
-   src="/graphics/t-desktop-4-small.jpg" alt="Capturas de pantalla de GNU"
+   src="/graphics/t-desktop-4-small.jpg" alt="Screenshot of GNU"
    /></a></p>
 
-<p>El <a href="/gnu/gnu.es.html">Proyecto GNU</a> se inició en 1984 para
-desarrollar el sistema GNU. El nombre «GNU» (que significa «ñu» en 
inglés)
-es un acrónimo recursivo de «¡GNU No es Unix!» y <a
-href="/pronunciation/pronunciation.html">en español se pronuncia
-fonéticamente</a> como una sílaba sin vocal entre la <em>g</em> y la
-<em>n</em>.</p>
-
-<p>Los sistemas operativos similares a Unix se construyen a partir de un <a
-href="/software/">conjunto de aplicaciones</a>, bibliotecas y herramientas
-de programación, además de un programa para alojar recursos e interactuar
-con el hardware, denominado núcleo.</p>
-
-<p><a href="/software/hurd/hurd.html">Hurd, el núcleo propio de GNU</a>, está
-lejos de poderse usar en el día a día. Por este motivo, GNU se usa
-habitualmente con un núcleo denominado Linux. Esta combinación es el <a
-href="/gnu/linux-and-gnu.es.html"> <strong>sistema operativo
-GNU/Linux</strong></a>. GNU/Linux lo usan millones de personas, aunque
-muchos lo <a href="/gnu/gnu-linux-faq.es.html">denominan «Linux» por
-error</a>.</p>
+<p>The <a href="/gnu/gnu.html">GNU Project</a> was launched in 1984 to develop
+the GNU system.  The name &ldquo;GNU&rdquo; is a recursive acronym for
+&ldquo;GNU's Not Unix!&rdquo;.  <a href="/pronunciation/pronunciation.html">
+"GNU" is pronounced <em>g'noo</em></a>, as one syllable, like saying "grew"
+but replacing the <em>r</em> with <em>n</em>.</p>
+
+<p>A Unix-like operating system is a <a href="/software/">software
+collection</a> of applications, libraries, and developer tools, plus a
+program to allocate resources and talk to the hardware, known as a kernel.</p>
+
+<p><a href="/software/hurd/hurd.html">The Hurd, GNU's own kernel</a>, is some
+way from being ready for daily use.  Thus, GNU is typically used today with
+a kernel called Linux.  This combination is the <a
+href="/gnu/linux-and-gnu.html"> <strong>GNU/Linux operating
+system</strong></a>.  GNU/Linux is used by millions, though many <a
+href="/gnu/gnu-linux-faq.html"> call it "Linux" by mistake</a>.</p>
 
-<p><a href="/provide.html">Lo que proporcionamos</a></p>
+<p><a href="/provide.html">What we provide</a>.</p>
 
 <!--
    Keep link lines at 72 characters or lynx will break them poorly.
@@ -82,7 +79,7 @@
            
       <div class="yui-u">
 
-      <p class="button c large"><a 
href="/distros/free-distros.html">¡Descargue GNU ahora!</a></p>
+      <p class="button c large"><a href="/distros/free-distros.html">Download 
GNU now</a></p>
 
       <div class="emph-box">
 
@@ -92,7 +89,7 @@
    Please don't make it GNU's Flash.
 -->
 <h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a> <a
-href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" 
alt="Feed RSS" /></a></h4>
+href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png" 
alt="RSS Feed" /></a></h4>
 
 <!--
    FOR ENTRIES ADDED TO GNUs FLASHES:
@@ -109,26 +106,25 @@
    MORE THAN 2 ITEMS HERE.
 -->
 <!--#include virtual="/planetfeeds.html" -->
-<p>Para más noticias visite <a href="http://planet.gnu.org/"; >Planet 
GNU</a></p>
+<p>For more news, see <a href="http://planet.gnu.org/";>Planet GNU</a>.</p>
 
 <!-- END GNUFlashes -->
-<h4>Guile de GNU</h4>
-<p><a href="http://www.gnu.org/software/guile/";>Guile de GNU</a> es el lenguaje
-de extensión oficial del sistema operativo GNU. La versión 2.0 se publicó el
-16 de febrero de 2011 con <a
-href="http://www.gnu.org/software/guile/news.html";>muchas funcionalidades
-nuevas</a>. Su infraestructura de compilación, bibliotecas y el entorno
-dinámico de programación hacen que sea un gran lenguaje para programar
-aplicaciones.  <a
-href="http://www.gnu.org/software/guile/community.html";>¡Únete a la
-comunidad ahora!</a></p>
+<h4>GNU Guile</h4>
+<p><a href="http://www.gnu.org/software/guile/";>GNU Guile</a> is the official
+extension language for the GNU Operating System. Version 2.0 was released
+February 16, 2011 with a <a
+href="http://www.gnu.org/software/guile/news.html";>wealth of new
+features.</a> Its compiler infrastructure, libraries, and dynamic
+programming environment make it a great language to write applications in.
+<a href="http://www.gnu.org/software/guile/community.html";>Join the
+community now!</a></p>
 
 <h4>GNUstep</h4>
 
-<p><a href="http://www.gnustep.org/";>GNUstep</a> es un entorno de programación
-orientado a objetos totalmente funcional. Necesitamos programadores para
-escribir y migrar aplicaciones a GNUstep para que podamos ofrecer una
-excelente experiencia a los usuarios.</p>
+<p><a href="http://www.gnustep.org/";>GNUstep</a> is a fully-functional
+object-oriented development environment. We need developers to write and
+port applications to GNUstep so that we can make it a great experience for
+users.</p>
 
          </div>
           </div>
@@ -138,26 +134,26 @@
 <div class="yui-gc">
     <div class="yui-u first">
 
-<h2>¿Qué es el software libre?</h2>
+<h2>What is Free Software?</h2>
 
-<p>El «<a href="/philosophy/free-sw.es.html">Software Libre</a>» es un asunto
-de libertad, no de precio. Para entender el concepto, debe pensarse en
-«libre» como en «libertad de expresión», no como en «cerveza 
gratis».</p>
-
-<p><strong>El software libre es una cuestión de libertad de los usuarios para
-ejecutar, copiar, distribuir, estudiar, cambiar y modificar el
-software</strong>. Más concretamente, se refiere a los cuatro tipos de
-libertades para los usuarios de software:</p>
+<p>&ldquo;<a href="/philosophy/free-sw.html">Free software</a>&rdquo; is a
+matter of liberty, not price.  To understand the concept, you should think
+of &ldquo;free&rdquo; as in &ldquo;free speech&rdquo;, not as in &ldquo;free
+beer&rdquo;.</p>
+
+<p><strong>Free software is a matter of the users' freedom to run, copy,
+distribute, study, change and improve the software.</strong> More precisely,
+it refers to four kinds of freedom, for the users of the software:</p>
 
 <ul>
-<li>La libertad de usar el programa, con cualquier propósito (libertad 
0).</li>
-<li>La libertad de estudiar el funcionamiento del programa, y adaptarlo a sus
-necesidades (libertad 1). El acceso al código fuente es un prerrequisito
-para esto.</li>
-<li>La libertad de distribuir copias para ayudar a los demás (libertad 
2).</li>
-<li>La libertad de mejorar el programa y de publicar las mejoras, de modo que
-toda la comunidad se beneficie (libertad 3). El acceso al código fuente es
-un prerrequisito para esto.</li>
+<li>The freedom to run the program, for any purpose (freedom 0).</li>
+<li>The freedom to study how the program works, and adapt it to your needs
+(freedom 1).  Access to the source code is a precondition for this.</li>
+<li>The freedom to redistribute copies so you can help your neighbor (freedom
+2).</li>
+<li>The freedom to improve the program, and release your improvements to the
+public, so that the whole community benefits (freedom 3).  Access to the
+source code is a precondition for this.</li>
 </ul>
 
 </div>
@@ -165,44 +161,42 @@
 <div class="yui-u">
 
 <!-- BEGIN TakeAction -->
-<h2 id="Action">Tome partido</h2>
+<h2 id="Action">Take Action</h2>
 <ul>
-<li><a href="http://www.fsf.org/campaigns";>Apoye las campañas en curso de la
-FSF</a>.</li>
+<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
+campaigns</a></strong>.</li>
 
-<li><strong>Únase a las protestas en contra de <a
-href="http://www.laquadrature.net/wiki/How_to_act_against_ACTA";>ACTA</a>, de
-la directiva Europea contra el compartir <a
+<li><strong>Join the protests against <a
+href="http://www.laquadrature.net/wiki/How_to_act_against_ACTA";>ACTA</a>,
+the European Anti-Sharing Directive <a
 href="http://www.laquadrature.net/en/anti-sharing-directive-ipred";>IPRED</a>
-y <a href="http://www.laquadrature.net/en/";>otras leyes abusivas para
-Internet</a></strong>.</li>
+and <a href="http://www.laquadrature.net/en/";> other abusive internet laws
+</a></strong>.</li>
 
-<li><strong>Vea la siguiente película</strong> (en inglés): <a
-href="http://patentabsurdity.com";>Patent Absurdity</a>, hecha gracias a los
-<a href="http://www.fsf.org/associate/";>miembros asociados de la FSF</a>
-como <a href="http://fsf.org/jfb";>usted</a>.</li>
-
-<li><strong>Luche contra las patentes de software:</strong> <a
-href="http://www.endsoftpatents.org";>en el mundo</a> y <a
-href="/server/takeaction.html#swpat">en Europa</a>.</li>
-
-<li><strong><a href="/server/takeaction.html#wipochange">Solicite a la
-OMPI</a></strong> que cambie su nombre y su misión.</li>
-
-<li>Apoye los esfuerzos para la neutralidad de la red en Europa, <a
-href="http://www.savetheinternet.com"; title="Neutralidad de la red en los
-Estados Unidos de América">en los EE.UU.</a> y <a
-href="http://www.neutrality.ca"; title="Neutralidad en la red en Canadá">en
-Canadá</a>.</li>
-
-<li>¡Estudiantes! <a
-href="http://www.aful.org/communiques/univ-offers-me-windows";>Reclamen la
-devolución del importe de las licencias Microsoft Windows sin 
utilizar.</a></li>
+<li><strong>Watch and share this movie:</strong> <a
+href="http://patentabsurdity.com";>Patent Absurdity</a>&mdash;made possible
+by <a href="http://www.fsf.org/associate/";>FSF associate members</a> like <a
+href="http://fsf.org/jfb";>you</a>.</li>
 
-<li><a href="/server/takeaction.html#directory">Contribuya al Directorio de
-Software Libre</a>.</li>
+<li><strong>Fight against software patents:</strong> <a
+href="http://www.endsoftpatents.org";>worldwide</a>, <a
+href="/server/takeaction.html#swpat">and Europe</a>.</li>
 
-<li><a href="/server/takeaction.html">Más acciones</a>.</li>
+<li><strong><a href="/server/takeaction.html#wipochange">Call on
+WIPO</a></strong> to change its name and mission.</li>
+
+<li>Support the efforts on net neutrality in Europe, <a
+href="http://www.savetheinternet.com"; title="Net neutrality in the United
+States of America">in the USA</a> and <a href="http://www.neutrality.ca";
+title="Net neutrality in Canada">in Canada</a>.</li>
+
+<li>Students! <a href="http://www.aful.org/communiques/univ-offers-me-windows";>
+Claim a refund on your unused Microsoft Windows licences</a>.</li>
+
+<li><a href="/server/takeaction.html#directory">Add to the Free Software
+Directory</a>.</li>
+
+<li><a href="/server/takeaction.html">More action items.</a></li>
 
 </ul>
 
@@ -212,16 +206,16 @@
 
 <div class="yui-g highlight-para">
 
-<p>¿<strong>Puede colaborar con alguno de estos  <a
-href="http://www.fsf.org/campaigns/priority-projects/";>proyectos
-prioritarios</a>?</strong> Gnash,coreboot, distribuciones libres de
-GNU/Linux, GNU Octave, controladores para routers de red y depuración
-reversible en GDB, transcripción automática, drivers para PowerVR. También
-recambios de software para para Skype, bibliotecas OpenDWG y Oracle Forms.</p>
-
-<p id="unmaint"><strong>¿Puede ayudar encargándose de uno de estos <a
-href="/server/takeaction.html#unmaint">paquetes de GNU sin
-mantenimiento</a>?</strong> <a href="/software/alive/">alive</a>, <a
+<p><strong>Can you contribute to any of these <a
+href="http://www.fsf.org/campaigns/priority-projects/";>High Priority
+Projects</a>?</strong> Gnash, coreboot, free distributions of GNU/Linux, GNU
+Octave, drivers for network routers, reversible debugging in GDB, automatic
+transcription, PowerVR drivers, and also free software replacements for
+Skype, OpenDWG libraries, and Oracle Forms.</p>
+
+<p id="unmaint"><strong>Can you take over an <a
+href="/server/takeaction.html#unmaint">unmaintained GNU
+package</a>?</strong> <a href="/software/alive/">alive</a>, <a
 href="/software/dotgnu-forum/">dotgnu-forum</a>, <a
 href="/software/dr-geo/">dr-geo</a>, <a
 href="/software/gnatsweb/">gnatsweb</a>, <a
@@ -233,11 +227,10 @@
 href="/software/quickthreads/">quickthreads</a>, <a
 href="/software/rottlog/">rottlog</a>, <a
 href="/software/snakecharmer/">snakecharmer</a>, <a
-href="/software/thales/">thales</a>. Para todos ellos <a
-href="/server/takeaction.html#unmaint">estamos buscando encargados de
-mantenimiento</a>.  También necesitamos <a
-href="/server/takeaction.html#python_configure">GNU configure para paquetes
-Python</a>.</p>
+href="/software/thales/">thales</a> are all <a
+href="/server/takeaction.html#unmaint">looking for maintainers</a>.  We also
+need <a href="/server/takeaction.html#python_configure">GNU configure for
+Python packages</a>.</p>
 
 </div>
 </div>
@@ -245,7 +238,7 @@
 <div style="font-size: small;">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
- </div>
+*GNUN-SLOT: TRANSLATOR'S NOTES*</div>
 </div>
 
 <!--#include virtual="/server/footer.es.html" -->
@@ -258,12 +251,12 @@
   generating GNU manuals online, so please don't remove it.
 -->
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010 , 2011, 2012 <a href="http://www.fsf.org";>Free
+2006, 2007, 2008, 2009, 2010, 2011, 2012 <a href="http://www.fsf.org";>Free
 Software Foundation</a>, Inc.</p>
 
-<p>La <a href="http://www.fsf.org/";>FSF</a> también tiene organizaciones
-hermanas en <a href="http://www.fsfe.org";>Europa</a>, <a
-href="http://www.fsfla.org/";>América Latina</a> y en la <a
+<p>The <a href="http://www.fsf.org/";>FSF</a> also has sister organizations in
+<a href="http://www.fsfe.org";>Europe</a>, <a
+href="http://www.fsfla.org/";>Latin America</a> and <a
 href="http://fsf.org.in/";>India</a>.</p>
 
 <p>Esta página está bajo una <a rel="license"
@@ -275,8 +268,7 @@
 <div class="translators-credits">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<strong>Traducción: Emilio Silva, 2004.</strong> Revisiones: Miguel Vázquez
-Gocobachi, Xavier Reina, Dora Scilipoti.</div>
+*GNUN-SLOT: TRANSLATOR'S CREDITS*</div>
 
 <p>
 Para obtener información sobre cómo traducir al español las páginas de 
este 
@@ -287,11 +279,7 @@
  <p><!-- timestamp start -->
 Última actualización: 
 
-<<<<<<< home.es.html
-$Date: 2012/09/15 19:34:25 $
-=======
-$Date: 2012/09/15 19:34:25 $
->>>>>>> 1.98
+$Date: 2012/09/15 21:26:19 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/thegnuproject.ja.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.ja.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gnu/thegnuproject.ja.html   15 Sep 2012 19:46:09 -0000      1.18
+++ gnu/thegnuproject.ja.html   15 Sep 2012 21:26:31 -0000      1.19
@@ -494,11 +494,7 @@
 <!-- timestamp start -->
 最終更新:
 
-<<<<<<< thegnuproject.ja.html
-$Date: 2012/09/15 19:46:09 $
-=======
-$Date: 2012/09/15 19:46:09 $
->>>>>>> 1.17
+$Date: 2012/09/15 21:26:31 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/thegnuproject.nl.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.nl.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu/thegnuproject.nl.html   15 Sep 2012 19:46:09 -0000      1.11
+++ gnu/thegnuproject.nl.html   15 Sep 2012 21:26:32 -0000      1.12
@@ -148,7 +148,7 @@
 href="http://www.gnu.org/philosophy/why-free.nl.html";>
 http://www.gnu.org/philosophy/why-free.nl.html</a>.</p>
 
-<h3>Een duidelijke morele keuze.</h3>
+<h3>A stark moral choice</h3>
 <p>
 Nu mijn gemeenschap verdwenen was, kon ik niet op de oude voet doorgaan.  In
 plaats daarvan werd ik geconfronteerd met een scherpe morele keuze.</p>
@@ -1072,7 +1072,7 @@
 <!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2012/09/15 19:46:09 $
+$Date: 2012/09/15 21:26:32 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/thegnuproject.pl.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.pl.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/thegnuproject.pl.html   15 Sep 2012 19:46:09 -0000      1.22
+++ gnu/thegnuproject.pl.html   15 Sep 2012 21:26:32 -0000      1.23
@@ -1157,11 +1157,7 @@
 <!-- timestamp start -->
 Aktualizowane:
 
-<<<<<<< thegnuproject.pl.html
-$Date: 2012/09/15 19:46:09 $
-=======
-$Date: 2012/09/15 19:46:09 $
->>>>>>> 1.21
+$Date: 2012/09/15 21:26:32 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/thegnuproject.ru.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.ru.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/thegnuproject.ru.html   15 Sep 2012 19:46:09 -0000      1.10
+++ gnu/thegnuproject.ru.html   15 Sep 2012 21:26:32 -0000      1.11
@@ -1098,11 +1098,7 @@
 <!-- timestamp start -->
 Обновлено:
 
-<<<<<<< thegnuproject.ru.html
-$Date: 2012/09/15 19:46:09 $
-=======
-$Date: 2012/09/15 19:46:09 $
->>>>>>> 1.9
+$Date: 2012/09/15 21:26:32 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/thegnuproject.sq.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.sq.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/thegnuproject.sq.html   15 Sep 2012 19:46:09 -0000      1.14
+++ gnu/thegnuproject.sq.html   15 Sep 2012 21:26:33 -0000      1.15
@@ -8,6 +8,12 @@
 <meta http-equiv="Keywords" content="GNU, Projekti GNU, FSF, Free Software, 
Free Software Foundation, Historik" />
 
 <!--#include virtual="/server/banner.sq.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/gnu/po/thegnuproject.sq.po";>
+ http://www.gnu.org/gnu/po/thegnuproject.sq.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/gnu/thegnuproject.html" -->
+ <!--#set var="DIFF_FILE" value="/gnu/po/thegnuproject.sq-diff.html" -->
+ <!--#include virtual="/server/outdated.sq.html" -->
 <!--#include virtual="/gnu/po/thegnuproject.translist" -->
 <h2>Projekti GNU</h2>
 
@@ -147,7 +153,7 @@
 href="/philosophy/why-free.html">
 http://www.gnu.org/philosophy/why-free.html</a>.</p>
 
-<h3>Një zgjedhje e ashpër morale.</h3>
+<h3>A stark moral choice</h3>
 <p>
 Pasi u zhduk bashkësia ime, qe e pamundur të vazhdohej si më parë.  Në 
vend
 të saj, u përballa me një zgjedhje morale të ashpër.</p>
@@ -1077,7 +1083,7 @@
 <!-- timestamp start -->
 U përditësua më:
 
-$Date: 2012/09/15 19:46:09 $
+$Date: 2012/09/15 21:26:33 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/thegnuproject.tr.html
===================================================================
RCS file: /web/www/www/gnu/thegnuproject.tr.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/thegnuproject.tr.html   15 Sep 2012 19:46:09 -0000      1.7
+++ gnu/thegnuproject.tr.html   15 Sep 2012 21:26:33 -0000      1.8
@@ -142,7 +142,7 @@
 okuyuculara <a href="/philosophy/why-free.html">
 http://www.gnu.org/philosophy/why-free.html</a> sayfasını öneririm.</p>
 
-<h3>Yalın Ahlaki Seçim</h3>
+<h3>A stark moral choice</h3>
 <p>
 Topluluğumuzun sona ermesiyle, daha önceki gibi devam etmek mümkün
 değildi. Bunun yerine, bir yalın ahlaki seçimle karşı karşıya 
geldim.</p>
@@ -1048,7 +1048,7 @@
 <!-- timestamp start -->
 Son Güncelleme:
 
-$Date: 2012/09/15 19:46:09 $
+$Date: 2012/09/15 21:26:33 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/thegnuproject.ja-en.html
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.ja-en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu/po/thegnuproject.ja-en.html     15 Sep 2012 19:46:52 -0000      1.11
+++ gnu/po/thegnuproject.ja-en.html     15 Sep 2012 21:27:12 -0000      1.12
@@ -1035,11 +1035,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-<<<<<<< thegnuproject.ja-en.html
-$Date: 2012/09/15 19:46:52 $
-=======
-$Date: 2012/09/15 19:46:52 $
->>>>>>> 1.10
+$Date: 2012/09/15 21:27:12 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/thegnuproject.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.nl.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/po/thegnuproject.nl.po  15 Sep 2012 19:46:53 -0000      1.5
+++ gnu/po/thegnuproject.nl.po  15 Sep 2012 21:27:12 -0000      1.6
@@ -6,11 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-<<<<<<< thegnuproject.nl.po
-"POT-Creation-Date: 2012-09-13 10:16-0300\n"
-=======
-"POT-Creation-Date: 2012-09-13 12:25-0300\n"
->>>>>>> 1.4
+"POT-Creation-Date: 2012-09-15 15:32-0300\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <address@hidden>\n"
 "Language-Team: \n"

Index: gnu/po/thegnuproject.pl-en.html
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.pl-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/po/thegnuproject.pl-en.html     15 Sep 2012 19:46:53 -0000      1.7
+++ gnu/po/thegnuproject.pl-en.html     15 Sep 2012 21:27:12 -0000      1.8
@@ -1035,11 +1035,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-<<<<<<< thegnuproject.pl-en.html
-$Date: 2012/09/15 19:46:53 $
-=======
-$Date: 2012/09/15 19:46:53 $
->>>>>>> 1.6
+$Date: 2012/09/15 21:27:12 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/po/thegnuproject.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/thegnuproject.ru-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/po/thegnuproject.ru-en.html     15 Sep 2012 19:46:53 -0000      1.7
+++ gnu/po/thegnuproject.ru-en.html     15 Sep 2012 21:27:12 -0000      1.8
@@ -1035,11 +1035,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-<<<<<<< thegnuproject.ru-en.html
-$Date: 2012/09/15 19:46:53 $
-=======
-$Date: 2012/09/15 19:46:53 $
->>>>>>> 1.6
+$Date: 2012/09/15 21:27:12 $
 <!-- timestamp end -->
 </p>
 </div>

Index: help/help.pt-br.html
===================================================================
RCS file: /web/www/www/help/help.pt-br.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- help/help.pt-br.html        15 Sep 2012 19:49:29 -0000      1.3
+++ help/help.pt-br.html        15 Sep 2012 21:27:23 -0000      1.4
@@ -1,259 +1,286 @@
-<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//PT">
-<HTML>
-<HEAD>
-<TITLE>Como você pode ajudar o Projeto GNU - Fundação para o Software Livre 
(FSF)</TITLE>
-<LINK REV="made" HREF="mailto:address@hidden";>
-<LINK REV="translated" HREF="mailto:address@hidden";>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#1F00FF" ALINK="#FF0000" 
VLINK="#9900DD">
-
-<H3>Como você pode ajudar o Projeto GNU</H3>
-<A HREF="/graphics/agnuhead.html"><IMG SRC="/graphics/gnu-head-sm.jpg"
-   ALT=" [imagem da cabeça de um GNU] "
-   WIDTH="129" HEIGHT="122"></A>
-<!-- Please keep this list alphabetical -->
-[
-  <A HREF="/help/help.ca.html">Catalão</A>
-| <A HREF="/help/help.es.html">Espanhol</A>
-| <A HREF="/help/help.fr.html">Francês</A>
-| <A HREF="/help/help.en.html">Inglês</A>
-| <A HREF="/help/help.it.html">Italiano</A>
-| <A HREF="/help/help.pt-br.html">português do Brasil</A>
-]
-<P>
-<HR>
-<P>
-<H4>Conteúdo</H4>
-<UL>
-  <LI><A HREF="#guide" NAME="TOCguide">Guia do Projeto GNU</A>
-  <LI><A HREF="#helpgnu" NAME="TOChelpgnu">Como ajudar o Projeto GNU</A>
-</UL>
-<P>
-<HR>
-<P>
-<H4><A HREF="#TOCguide" NAME="guide">Guia do Projeto GNU</A></H4>
-<P>
-Os coordenadores dos voluntários do GNU
+
+
+<!--#include virtual="/server/header.pt-br.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Como voce pode ajudar o projeto GNU - projeto GNU - Fundacao para o 
Software
+Livre (FSF)</title>
+
+<!--#include virtual="/server/banner.pt-br.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/help/po/help.pt-br.po";>
+ http://www.gnu.org/help/po/help.pt-br.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/help/help.html" -->
+ <!--#set var="DIFF_FILE" value="" -->
+ <!--#include virtual="/server/outdated.pt-br.html" -->
+<!--#include virtual="/help/po/help.translist" -->
+<h2>Um guia para ajudar o sistema operacional GNU</h2>
+
+<p>Os coordenadores dos voluntarios do GNU
 <A HREF="mailto:address@hidden";>&lt;address@hidden&gt;</A>
 
-podem ajuda-lo se você deseja ajudar o Projeto GNU. Eles podem coloca-lo
+podem ajuda-lo se voce deseja ajudar o Projeto GNU. Eles podem coloca-lo
 em contato com outras pessoas interessadas em trabalhar em projetos
-similares. Quando você selecionar uma tarefa da nossa lista de tarefas,
-por favor comunique a eles que você está interessado em trabalhar nessa
-tarefa.
-<P>
-
-Por favor envie questões sobre o Projeto GNU para
-<A HREF="mailto:address@hidden";>address@hidden</A>,
-comentários sobre estas páginas web para
-<A HREF="mailto:address@hidden";>address@hidden</A>.
-<P>
-<H4><A HREF="#TOChelpgnu" NAME="helpgnu">Como ajudar o Projeto GNU</A></H4>
-<P>
-
-<UL>
-  <LI>Escreva, avalie e use software livre.
-       <P>
-       
-       <UL>
-        <LI>Instale e use
-             <A HREF="/software/software.html">software livre</A>.
-             A maneira mais fácil de fazer isso no momento é instalar
-             e utilizar um sistema GNU/Linux.
-             <P>
-       
-        <LI>Avalie software livre.
-             <UL>
-               <LI>Você pode se tornar um membro do
-                    <a href="/help/evaluation.html">Grupo
-                    de Avaliação de Software GNU</a>.
-             </UL>
-             <P>
-             
-        <LI>Escreva software livre.
-             <UL>
-               <LI>A página
-                    <A HREF="/prep/tasks.html">Lista de tarefas GNU</A>
-                    documenta novas tarefas que necessitam de voluntários.
-               <LI>A
-                    <A href="http://savannah.gnu.org/people/";>página de ajuda 
do Savannah</a>
-                    contém pedidos de ajuda para projetos do GNU que estão
-                    hospedados em savannah.
-               <LI>Contribua para um desses 
-                    <a 
href="http://www.fsf.org/campaigns/priority.html";>projetos
-                    de software livre de alta prioridade</a>
-                    
-             </UL>
-             Quando escrevendo software, por favor siga os
-             <A HREF="/prep/standards_toc.html">Padrões GNU
-             de Codificação</A>
-             e leia <A HREF="/prep/maintain_toc.html">Informações
-             Para Mantenedores de Software GNU</A>
-             à medida que você mantém o software
-              <P>
-              Se você necessita de algum recurso para desenvolver software
-              GNU, por favor veja a página de
-              <A href="/software/devel.pt-br.html">Recursos para o 
Desenvolvedor
-              de Software GNU</A>.
-       </UL>
-       <P>
-
-  <LI><A NAME="documentation">Escreva documentação para o software GNU,</A>
-     utilizando os seguintes
-     <A href="/doc/doc.pt-br.html#PleaseHelpWriteDocumentation">recursos, 
dicas e conselhos</A>.
-       <P>
-
-  <LI>Por favor ajude escrevendo melhores descrições dos
-       <A HREF="/doc/doc.pt-br.html#DescriptionsOfGNUDocumentation">livros
-       GNU publicados</a>.
-       <P>
-
-  <LI>Seja voluntário como revisor assinando a
-       lista de e-mail dos revisores (você faz isso enviando uma mensagem
-       contendo no seu corpo a palavra "subscribe" para
-       <A HREF="mailto:address@hidden";>&lt;address@hidden&gt;</A>)
-       <P>
-
-  <LI>Seja voluntário para ajudar na compilação de um
-       <A href="/gnulist/production/index.html">diretório de todo
-       o software livre conhecido</A>.
-       Esta tarefa envolve baixar pacotes de software livre, sumarisar
-       informações sobre estes pacotes, e verificando as licensas dos
-       programas.
-       <P>
-       Se você está interessado em ser voluntário para esta tarefa, por
-       favor contacte
-       <A href="mailto:address@hidden";>&lt;address@hidden&gt;</A>.
-
-<P>
-
-  <LI>Seja voluntário para garantir que os artigos em nossa
-       <A href="/philosophy/philosophy.pt-br.html">página de filosofia</A>
-       e outras URLs do site do GNU estejam ou sejam linkadas por diretórios
-       da internet, portais, e vários índices hierárquivos da WWW como o 
Yahoo!,
-       dmoz.org e o Google. Faça com que esses sites adicionem registros
-       detalhados sobre nossas diferentes páginas. Tenha certeza de que os
-       artigos em nossa
-       <A href="/philosophy/philosophy.pt-br.html">página de filosfia</A>
-       e outras URLS do site do GNU sejam listadas nas categorias apropriadas.
-       <P>
-       Se você gostaria de nos ajudar nesta tarefa, por favor contacte os
-       Coordenadores de Voluntários GNU
-       <A href="mailto:address@hidden";>&lt;address@hidden&gt;</A>.
-
-
-<P>
-  <LI>Fale a outras pessoas sobre o Projeto GNU e a Fundação para o Software
-  Livre:
-       <P>
-       <UL>
-         <LI>Informando os seus amigos sobre a
-         <A href="/philosophy/philosophy.pt-br.html">filosofia</A>
-         e sobre o <A href="/software/software.html">software</A> GNU.
-       <P>
-        <LI>Na sua home-page,
-             <A HREF="/help/linking-gnu.html">adicione um link para
-             a página principal do GNU</A>,<BR>
-             e peça a outros para fazerem o mesmo.
-             
-  <P>
-        <LI>
-             <A HREF="/server/mirror.html">Espelhe</A>
-             este site web, assim como outros
-             <A HREF="/server/list-mirrors.html">sites</A>
-             já estão fazendo,<BR>
-             e peça a mais pessoas para fazerem o mesmo.
-       </UL>
-  <P>
-
-  <LI>Ajude a FSF a levantar fundos para nos ajudar a escrever mais
-        software livre e mais documentação:
-       <P>
-       <UL>
-        <LI>Fazendo uma <A HREF="http://donate.fsf.org/";>doação</A> para a FSF.
-  <P>
-
-        <LI><A HREF="http://order.fsf.org/";>Comprando</a> manuais,
-             camisetas e principalmente CD-ROMs da FSF sempre que você
-             possa. A maioria da renda da FSF vem da venda de cópias de
-             coisas que todos são livres para copiar.
-
-  <P>
-        <LI>Convença a sua empresa a comprar manuais, camisetas e
-             principalmente CD-ROMs sempre que você possa.
-
-  <P>
-        <LI>Convença a sua empresa a comprar uma
-             <A HREF="http://order.fsf.org/";>Distribuição de Luxo</A>
-             da FSF.
-
-  <P>
-        <LI><A HREF="/philosophy/selling.html">Venda software livre</A>
-             e doe uma parte da renda para a
-             <A HREF="/fsf/fsf.html">Fundação para o Software Livre</A>
-             ou outro projeto de desenvolvimento de software livre.
-             Financiando o desenvolvimento,
-             você pode ajudar o mundo do software livre a ir adiante.
-
-             <P>
-
-             <STRONG>Distribuir software livre é uma oportunidade de
-             levantar fundos para o desenvolvimento. Não a desperdice!
-             </STRONG>
-
-       </UL>
-  <P>
-
-  <LI>Doe manterial de escritório e equipamentos para a FSF.
-       Ofereça as doações para
-       <A HREF="mailto:address@hidden";>&lt;address@hidden&gt;</A>.
-  <P>
-
-  <LI>Assuma uma das
-       <A HREF="/server/tasks.html">tarefas (14k caracteres)</A>
-       que nós necessitamos neste
-       <A HREF="/server/server.html">servidor web</A>.
-  <P>
-
-  <LI>Se você ou sua empresa suportam o desenvolvimento de software livre
-       de alguma forma, você pode ser listado (ou sua empresa) no
-       <A href="/prep/service.html">Diretório de Serviços GNU</A>.
-  <P>
-
-  <LI>Se você gerencia uma empresa que necessita contratar pessoas
-       para trabalhar com software livre, você pode anunciar em nossa
-       <A HREF="/jobs/jobs.html">Página de Empregos com Software Livre</A>.
-  <P>
-
-</UL>
-
-<HR>
-
-Retorna à <A HREF="/home.pt-br.html">página principal do GNU</A>.
-<P>
-Por favor envie dúvidas ou questões sobre FSF e/ou GNU para
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-Há também <A HREF="/home.pt-br.html#ContactInfo">outros meios de contactar</A> 
a FSF.
-<P>
-Por favor envie comentários sobre estas páginas web para
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>,
-envie outras questões para
-<A HREF="mailto:address@hidden";><EM>address@hidden</EM></A>.
-<P>
-Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA  02110,  USA
-<P>
-A cópia fiel e a distribuição deste artigo completo é permitida em qualquer
-meio, desde que esta nota seja preservada.
-
-<P>
-Atualizado:
-<!-- hhmts start -->Last modified: Monday August 06 15:09:25 EET 2007 <!-- 
hhmts end -->
-
-<P>
-Traduzido por: Fernando Lozano
-<A href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
-
-<HR>
-</BODY>
-</HTML>
+similares. Quando voce selecionar uma tarefa da nossa lista de tarefas,
+por favor comunique a eles que voce esta interessado em trabalhar nessa
+tarefa.</p>
+
+<p>Por favor deixe os coordenadores de voluntarios GNU <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a> Saberem se voce pegou
+qualquer
+tarefa desta lista. Nos queremos rastrear em quais tarefas nossos
+voluntarios
+estao trabalhando.</p>
+
+<p>Por questoes gerais sobre o projeto GNU. Envie um email para <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a> e para
+sugestoes sobre este site web, envie um email para <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+
+<h3 id="helpgnu">Como ajudar o projeto GNU</h3>
+<p>
+Esta lista esta grosseiramente ordenada com os items mais urgentes no topo.
+
+Por favor note que muitas coisas nesta lista linkam para maiores, listas
+expandidas.
+</p>
+<ul>
+  <li>Ajude com o <a href="http://savannah.gnu.org";>Savannah</a>. Nos estamos
+buscando especialmente por tecnicos administradores de sistema. Voluntarios
+para ajudar com as submissoes de projetos pendentes, tambem sao bem
+vindos. Por favor olhe <a
+href="http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker";>general
+information on how to become a savannah hacker</a>. Por favor comunique isto
+com a gente na lista de discussao  <a
+href="http://lists.gnu.org/mailman/listinfo/savannah-hackers-public";>savannah-hackers-public</a>.</li>
+
+    <li>Organize um novo  <a 
href="http://libreplanet.org/wiki/Group_list";>Grupo
+de usuarios de GNU/Linux</a>.</li>
+
+    <li>Organize um novo Grupo de Ativismo do Software Livre para promover o 
uso de
+software livre em seu pais, regiao, ou cidade.</li>
+
+    <li>Seja um exemplo mudando para um sistema operacional que seja
+<em>completamente</em> <a href="/software/software.html">software
+livre</a>. A
+forma mais facil de fazer isso e instalar e usar uma das <a
+href="/distros/free-distros.html">distribuicoes livres de GNU/Linux</a>.</li>
+
+    <li>Escreva software livre:
+    <ul>
+        <li>Contribua para um dos <a
+href="http://www.fsf.org/campaigns/priority.html";>projetos de software livre
+
+de alta prioridade</a>.</li>
+        
+        <li>Escreva <a href="/server/takeaction.html#python_configure"> 
arquivos
+"configure" para
+pacotes em Python</a>.</li>
+
+        <li>A lista <a href="http://savannah.gnu.org/people/?type_id=1";>GNU 
Help
+Wanted</a> e uma lista geral de tarefas para os pacotes de software
+GNU. Voce
+pode considerar tambem, pegar um dos <a
+"href="/server/takeaction.html#unmaint">pacote GNU sem manutencao</a>.</li>
+
+        <li>Quando escrever software para GNU, por favor siga os documentos <a
+href="/prep/standards/">Padroes de Codificacao GNU</a> e <a
+href="/prep/maintain/">Informacao para mantenedores de software GNU</a>.</li>
+
+        <li>Para oferecer software que voce escrever para GNU, por favor olhe a
+informacao <a
+href="/help/evaluation.html">avaliacao de software GNU</a>.</li>
+
+        <li>We are sometimes offered software which already does substantially 
the same
+task as an existing GNU package.  Although of course we appreciate all
+offers, we'd naturally like to encourage programmers to spend their time
+writing free software to do new jobs, not already-solved ones.  So, before
+starting a new program, please check the <a
+href="http://directory.fsf.org/";>Free Software Directory</a> for free
+software that does the job already.</li>
+
+        <li>Nos podemos oferecer <a href="/software/devel.html">alguns 
recursos</a> para
+
+ajudar desenvolvedores de software.
+        </li>
+    </ul></li>
+
+    <li id="documentation">Escreva documentacao para software GNU.</li>
+
+    <li>Voluntarios como &ldquo;Verificador de Liberdade&rdquo; se uma 
distribuicao
+contem apenas software livre, assim ela pode ser incluida na <a
+"href="/distros/free-distros.html">lista de distribuicoes livres</a>.</li>
+
+   <li>Voluntario como Webmaster GNU completando <a
+href="http://www.gnu.org/server/standards/webmaster-quiz.html";> webmaster
+quiz</a>.</li>
+
+    <li id="helptranslations">Traduza o site web GNU para outras linguas.  
Mais informacao sobre a questao
+
+pode ser encontrada em <a
+href="/server/standards/README.translations.html">Guia para traduzir
+Paginas Web www.gnu.org</a>.  Escreva para <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
+se voce quer ajudar.</li>
+
+    <li>Conte aos outros do projeto GNU e da Fundacao para o Software Livre 
atraves
+de:
+    <ul>
+        <li>Informando seus amugos sobre a <a
+href="/philosophy/philosophy.html">filosofia</a> GNU e o <a
+href="/software/software.html">software</a> GNU.</li>
+
+        <li>Informando seus amigos que o sistema operacional 
&ldquo;Linux&rdquo e em
+realidade <a href="/gnu/linux-and-gnu.html">GNU/Linux</a>: que e o sistema
+GNU, mais Linux, o kernel. Simplesmente fazendo uma distincao consistente e
+infalivel entre GNU/Linux (todo o sistema) e e Linux (o kernel) quando voce
+escrever ou falar sobre o sistema, <a
+href="/gnu/why-gnu-linux.html">vai nos ajudar muito</a>, vai levar pouco
+tempo
+para voce esquecer o velho habito.</li>
+
+        <li><a href="/help/linking-gnu.html">Adicione um link para a pagina 
web GNU</a>,
+desde suas paginas web,
+e sugira que os outros facam o mesmo.</li>
+    </ul></li>
+
+    <li>Quando falar com pessoas que nao valorizam a liberdade e a comunidade, 
voce
+pode mostrar a eles muitas das vantagens praticas do software livre (olhe <a
+
+href="http://www.dwheeler.com/oss_fs_why.html";>Why Open Source / Free
+Software? Look at the Numbers!</a> para algumas evidencias uteis). Mas,
+fique mencionando as questoes eticas tambem!  Nao mude sua voz para uma voz
+open-source apenas para atender os outros.</li>
+
+    <li>Ajuda a FSF a angariar fundos por:
+    <ul>
+        <li>
+         Fazendo uma doacao <a href="http://donate.fsf.org/";>diretamente para a
+FSF</a>
+ou <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr";>via
+Flattr</a>.
+        </li>
+        <li>
+        Se tornando um <a href="http://member.fsf.org/";>membro associado</a> da
+FSF.
+        </li>
+
+        <li>
+        Escolhendo a FSF como beneficiaria na sua <a
+href="http://www.affero.com/ca/fsf";>pagina Affero</a>, likando para a sua
+pagina Affero FSF em sua assinatura de email, projeto de software, e
+escritos.
+        </li>
+
+        <li>
+        <a href="http://order.fsf.org/";>Comprando</a> manuais, camisetas, 
adesivos
+e equipamentos da FSF.
+        </li>
+
+        <li>
+        Convencendo seu escritorio de <a 
href="http://order.fsf.org/";>comprar</a>
+manuais e camisetas da FSF.
+        </li>
+
+        <li>
+        <a href="/philosophy/selling.html">vendendo software livre</a> e 
doando uma
+parte dos lucros para a <a href="/fsf/fsf.html">Fundacao para o Software
+Livre</a> ou algum outro projeto de desenvolvimento de software
+livre. Financiando o desenvolvimento, voce pode avancar o mundo do software
+livre.
+        <p>
+        <strong>Distribuir software livre e uma forma de obter fundos para o
+desenvolvimento. Nao a desperdice!</strong>
+        </p></li>
+    </ul></li>
+
+    <li>
+    Seja voluntario para garantir que os artigos em nossa
+<a href="/philosophy/philosophy.pt-br.html">pagina de filosofia</a>
+e outras URLs do site do GNU estejam ou sejam linkadas por diretorios
+da internet, portais, e varios indices hierarquivos da WWW como o Yahoo!,
+dmoz.org e o Google. Faca com que esses sites adicionem registros
+detalhados sobre nossas diferentes paginas. Tenha certeza de que os
+artigos em nossa
+<a href="/philosophy/philosophy.pt-br.html">pagina de filosfia</a>
+e outras URLS do site do GNU sejam listadas nas categorias apropriadas.
+Se voce gostaria de nos ajudar nesta tarefa, por favor contacte os
+Coordenadores de Voluntarios GNU
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+    </li>
+
+    <li>Doe <a href="/help/help-hardware.html">hardware</a> para a FSF.</li>
+
+    <li>Pegue um dos <a href="/server/tasks.html">trabalhos</a> que precisamos
+para este <a href="/server/server.html">servidor web</a>.</li>
+
+    <li id="ServiceDirectory">Se voce ou sua empresa da suporte ou desenvolve 
software livre de alguma
+maneira, voce pode listar voce mesmo (ou sua empresa) no <a
+href="/prep/service.html">Diretorio de Servico GNU</a>.</li>
+
+    <li>Se voce tem uma empresa que necessita contratar pessoas para 
trabalharem com
+software livre, voce pode anunciar em nossa <a
+href="http://www.fsf.org/resources/jobs/";>Pagina de Trabalho com Software
+Livre</a>.</li>
+
+    <li>Ofereca-se para contatar empresas procurando por postagens adicionais 
de
+empregos em nossa <a href="http://www.fsf.org/resources/jobs/";>Pagina de
+Trabalho com Software Livre</a>.
+Se voce se enteressa por isto, favor contatar <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</li>
+
+</ul>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.pt-br.html" -->
+<div id="footer">
+<p>
+Por favor envie &amp; consultas sobre GNU para <a
+href="mailto:address@hidden";><em>address@hidden<</em></a>.  Existem <a
+href="/contact/">outras formas de contatar</a> a FSF.
+<br />
+Por favor envie links quebrados e outras correcoes ou sugestoes para <a
+href="mailto:address@hidden";><em>address@hidden</em></a>
+</p>
+
+<p>
+Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+<br />
+Esta pagina e licensiada sob a licenca <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States License</a>.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<a href="http://freedomphilosophy.eu5.org";>Fabio J. Gonzalez</a>
+<a href="address@hidden">&lt;address@hidden&gt;</a>
+<br>
+Fernando Lozano <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a></div>
+
+
+ <p>
+<!-- timestamp start -->
+Updated:
+
+$Date: 2012/09/15 21:27:23 $
+
+<!-- timestamp end -->
+</p>
+
+</div>
+
+</div>
+</body>
+</html>

Index: help/po/help.pt-br.po
===================================================================
RCS file: /web/www/www/help/po/help.pt-br.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- help/po/help.pt-br.po       15 Sep 2012 19:49:45 -0000      1.1
+++ help/po/help.pt-br.po       15 Sep 2012 21:27:39 -0000      1.2
@@ -8,19 +8,23 @@
 msgstr ""
 "Project-Id-Version: help.html\n"
 "POT-Creation-Date: 2012-09-13 10:16-0300\n"
-"PO-Revision-Date: 2012-09-15 15:11-0300\n"
+"PO-Revision-Date: 2012-09-15 18:24-0300\n"
 "Last-Translator: Fabio J. Gonzalez <address@hidden>\n"
 "Language-Team: Brazilian Portuguese\n"
 "Language:  pt_BR\n"
 "MIME-Version: 1.0\n"
-"\"Content-Type: text/plain; charset=UTF-8\\n\"\n"
-"\"Content-Transfer-Encoding: 8bit\\n\""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-09-13 10:16-0300\n"
+"\n"
 
 #. type: Content of: <title>
 msgid ""
 "How you can help the GNU Project - GNU Project - Free Software Foundation "
 "(FSF)"
-msgstr "Como você pode ajudar o projeto GNU - projeto GNU - Fundação para o 
Software Livre (FSF)"
+msgstr ""
+"Como voce pode ajudar o projeto GNU - projeto GNU - Fundacao para o Software "
+"Livre (FSF)"
 
 #. type: Content of: <h2>
 msgid "A guide to helping the GNU operating system"
@@ -28,44 +32,44 @@
 
 #. type: Content of: <p>
 msgid ""
-"The GNU Volunteer Coordinators <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> can assist you if 
you "
-"wish to help the GNU Project. They will be able to put you in touch with "
-"other people interested in or working on similar projects. When you have "
-"selected a task from our task lists, please let them know you're interested "
-"in working on it."
+"The GNU Volunteer Coordinators <a 
href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a> can assist you if you wish to help the GNU Project. They will be "
+"able to put you in touch with other people interested in or working on "
+"similar projects. When you have selected a task from our task lists, please "
+"let them know you're interested in working on it."
 msgstr ""
-"Os coordenadores dos voluntários do GNU\n"
+"Os coordenadores dos voluntarios do GNU\n"
 "<A HREF=\"mailto:address@hidden";>&lt;address@hidden&gt;</A>\n"
 "\n"
-"podem ajuda-lo se você deseja ajudar o Projeto GNU. Eles podem coloca-lo\n"
+"podem ajuda-lo se voce deseja ajudar o Projeto GNU. Eles podem coloca-lo\n"
 "em contato com outras pessoas interessadas em trabalhar em projetos\n"
-"similares. Quando você selecionar uma tarefa da nossa lista de tarefas,\n"
-"por favor comunique a eles que você está interessado em trabalhar nessa\n"
+"similares. Quando voce selecionar uma tarefa da nossa lista de tarefas,\n"
+"por favor comunique a eles que voce esta interessado em trabalhar nessa\n"
 "tarefa."
 
 #. type: Content of: <p>
 msgid ""
-"Please let the GNU Volunteer Coordinators <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> know if you take on 
any "
-"task from this list.  We want to keep track of what tasks our volunteers are "
-"working on."
+"Please let the GNU Volunteer Coordinators <a 
href=\"mailto:address@hidden";>&lt;"
+"address@hidden&gt;</a> know if you take on any task from this list.  We want 
to "
+"keep track of what tasks our volunteers are working on."
 msgstr ""
 "Por favor deixe os coordenadores de voluntarios GNU <a \n"
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> Saberem se voce 
pegou qualquer \n"
-"tarefa desta lista. Nós queremos rastrear em quais  tarefas nossos 
voluntarios \n"
-"estão trabalhando."
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> Saberem se voce 
pegou "
+"qualquer \n"
+"tarefa desta lista. Nos queremos rastrear em quais tarefas nossos "
+"voluntarios \n"
+"estao trabalhando."
 
 #. type: Content of: <p>
 msgid ""
-"For general questions about the GNU project, mail <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> and for questions 
and "
-"suggestions about this web site, mail <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"For general questions about the GNU project, mail <a 
href=\"mailto:address@hidden";
+"org\">&lt;address@hidden&gt;</a> and for questions and suggestions about this 
"
+"web site, mail <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 msgstr ""
-"Por questões gerais sobre o projeto GNU. Envie um email para <a \n"
+"Por questoes gerais sobre o projeto GNU. Envie um email para <a \n"
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> e para \n"
-"sugestões sobre este site web, envie um email para <a \n"
+"sugestoes sobre este site web, envie um email para <a \n"
 "href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
 #. type: Content of: <h3>
@@ -77,29 +81,33 @@
 "This list is ordered roughly with the more urgent items near the top.  "
 "Please note that many things on this list link to larger, expanded lists."
 msgstr ""
-"Esta lista esta grosseiramente ordenada com os items mais urgentes no topo.  
\n"
-"Por favor note que muitas coisas nesta lista linkam para maiores, listas 
expandidas."
+"Esta lista esta grosseiramente ordenada com os items mais urgentes no "
+"topo.  \n"
+"Por favor note que muitas coisas nesta lista linkam para maiores, listas "
+"expandidas."
 
 #. type: Content of: <ul><li>
 msgid ""
 "Help with <a href=\"http://savannah.gnu.org\";>Savannah</a>. We are "
 "especially looking for technical sysadmin volunteers to help with underlying "
 "infrastructure support.  Volunteers to help with pending project submissions "
-"are also very welcome.  Please see this <a "
-"href=\"http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker\";>general
 "
-"information on how to become a savannah hacker</a>.  Please communicate with "
-"us on the <a "
-"href=\"http://lists.gnu.org/mailman/listinfo/savannah-hackers-public\";>savannah-hackers-public</a>
 "
-"mailing list."
-msgstr ""
-"Ajude com o <a href=\"http://savannah.gnu.org\";>Savannah</a>. Nós estamos\n"
-"buscando especialmente por técnicos administradores de sistema. Voluntarios\n"
-"para ajudar com as submissões de projetos pendentes, tambem são bem\n"
+"are also very welcome.  Please see this <a href=\"http://savannah.gnu.org/";
+"maintenance/HowToBecomeASavannahHacker\">general information on how to "
+"become a savannah hacker</a>.  Please communicate with us on the <a href="
+"\"http://lists.gnu.org/mailman/listinfo/savannah-hackers-public\";>savannah-"
+"hackers-public</a> mailing list."
+msgstr ""
+"Ajude com o <a href=\"http://savannah.gnu.org\";>Savannah</a>. Nos estamos\n"
+"buscando especialmente por tecnicos administradores de sistema. Voluntarios\n"
+"para ajudar com as submissoes de projetos pendentes, tambem sao bem\n"
 "vindos. Por favor olhe <a\n"
-"href=\"http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker\";>general\n"
-"information on how to become a savannah hacker</a>. Por favor comunique 
isto\n"
-"com a gente na lista de discussão  <a \n"
-"href=\"http://lists.gnu.org/mailman/listinfo/savannah-hackers-public\";>savannah-hackers-public</a>."
+"href=\"http://savannah.gnu.org/maintenance/HowToBecomeASavannahHacker";
+"\">general\n"
+"information on how to become a savannah hacker</a>. Por favor comunique "
+"isto\n"
+"com a gente na lista de discussao  <a \n"
+"href=\"http://lists.gnu.org/mailman/listinfo/savannah-hackers-public";
+"\">savannah-hackers-public</a>."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -114,20 +122,22 @@
 "Organize a new Free Software Activist Group to promote use of free software "
 "in your country, region or city."
 msgstr ""
-"Organize um novo Grupo de Ativismo do Software Livre para promover o uso de 
\n"
-"software livre em seu pais, região, ou cidade."
+"Organize um novo Grupo de Ativismo do Software Livre para promover o uso "
+"de \n"
+"software livre em seu pais, regiao, ou cidade."
 
 #. type: Content of: <ul><li>
 msgid ""
-"Set an example by switching to a <em>completely</em> <a "
-"href=\"/software/software.html\">free software</a> operating system.  The "
-"easiest way to do that is to install and use one of the <a "
-"href=\"/distros/free-distros.html\"> free GNU/Linux distributions</a>."
+"Set an example by switching to a <em>completely</em> <a href=\"/software/"
+"software.html\">free software</a> operating system.  The easiest way to do "
+"that is to install and use one of the <a href=\"/distros/free-distros.html"
+"\"> free GNU/Linux distributions</a>."
 msgstr ""
 "Seja um exemplo mudando para um sistema operacional que seja\n"
-"<em>completamente</em> <a href=\"/software/software.html\">software 
livre</a>. A\n"
-"forma mais facil de fazer isso é instalar e usar uma das <a\n"
-"href=\"/distros/free-distros.html\">distribuições livres de GNU/Linux</a>."
+"<em>completamente</em> <a href=\"/software/software.html\">software livre</"
+"a>. A\n"
+"forma mais facil de fazer isso e instalar e usar uma das <a\n"
+"href=\"/distros/free-distros.html\">distribuicoes livres de GNU/Linux</a>."
 
 #. type: Content of: <ul><li>
 msgid "Write free software:"
@@ -135,12 +145,12 @@
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"Contribute to the <a "
-"href=\"http://www.fsf.org/campaigns/priority.html\";>high priority free "
-"software projects</a>."
+"Contribute to the <a href=\"http://www.fsf.org/campaigns/priority.html";
+"\">high priority free software projects</a>."
 msgstr ""
 "Contribua para um dos <a\n"
-"href=\"http://www.fsf.org/campaigns/priority.html\";>projetos de software 
livre \n"
+"href=\"http://www.fsf.org/campaigns/priority.html\";>projetos de software "
+"livre \n"
 "de alta prioridade</a>."
 
 #. type: Content of: <ul><li><ul><li>
@@ -148,70 +158,72 @@
 "Write <a href=\"/server/takeaction.html#python_configure\">GNU configure for "
 "Python packages</a>."
 msgstr ""
-"Write <a href=\"/server/takeaction.html#python_configure\"> arquivos 
\"configure\" para \n"
+"Escreva <a href=\"/server/takeaction.html#python_configure\"> arquivos "
+"\"configure\" para \n"
 "pacotes em Python</a>."
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"The <a href=\"http://savannah.gnu.org/people/?type_id=1\";>GNU Help "
-"Wanted</a> list is the general task list for GNU software packages.  You "
-"might also consider taking over one of the <a "
-"href=\"/server/takeaction.html#unmaint\">unmaintained GNU packages</a>."
+"The <a href=\"http://savannah.gnu.org/people/?type_id=1\";>GNU Help Wanted</"
+"a> list is the general task list for GNU software packages.  You might also "
+"consider taking over one of the <a href=\"/server/takeaction.html#unmaint"
+"\">unmaintained GNU packages</a>."
 msgstr ""
 "A lista <a href=\"http://savannah.gnu.org/people/?type_id=1\";>GNU Help \n"
-"Wanted</a> é uma lista geral de tarefas para os pacotes de software GNU. Voce 
\n"
+"Wanted</a> e uma lista geral de tarefas para os pacotes de software GNU. "
+"Voce \n"
 "pode considerar tambem, pegar um dos <a \n"
-"\"href=\"/server/takeaction.html#unmaint\">pacote GNU sem manutenção</a>."
+"\"href=\"/server/takeaction.html#unmaint\">pacote GNU sem manutencao</a>."
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"When writing software for GNU, please follow the <a "
-"href=\"/prep/standards/\">GNU Coding Standards</a> and <a "
-"href=\"/prep/maintain/\">Information for Maintainers of GNU Software</a> "
-"documents."
+"When writing software for GNU, please follow the <a href=\"/prep/standards/"
+"\">GNU Coding Standards</a> and <a href=\"/prep/maintain/\">Information for "
+"Maintainers of GNU Software</a> documents."
 msgstr ""
 "Quando escrever software para GNU, por favor siga os documentos <a \n"
-"href=\"/prep/standards/\">Padrões de Codificação GNU</a> e <a \n"
-"href=\"/prep/maintain/\">Informação para mantenedores de software GNU</a>."
+"href=\"/prep/standards/\">Padroes de Codificacao GNU</a> e <a \n"
+"href=\"/prep/maintain/\">Informacao para mantenedores de software GNU</a>."
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"To offer software you have written to GNU, please see this <a "
-"href=\"/help/evaluation.html\">GNU software evaluation</a> information."
+"To offer software you have written to GNU, please see this <a href=\"/help/"
+"evaluation.html\">GNU software evaluation</a> information."
 msgstr ""
 "Para oferecer software que voce escrever para GNU, por favor olhe a \n"
-"informação <a \n"
-"href=\"/help/evaluation.html\">avaliação de software GNU</a>."
+"informacao <a \n"
+"href=\"/help/evaluation.html\">avaliacao de software GNU</a>."
 
 #. type: Content of: <ul><li><ul><li>
+#, fuzzy
 msgid ""
 "We are sometimes offered software which already does substantially the same "
 "task as an existing GNU package.  Although of course we appreciate all "
 "offers, we'd naturally like to encourage programmers to spend their time "
 "writing free software to do new jobs, not already-solved ones.  So, before "
-"starting a new program, please check the <a "
-"href=\"http://directory.fsf.org/\";>Free Software Directory</a> for free "
-"software that does the job already."
+"starting a new program, please check the <a href=\"http://directory.fsf.org/";
+"\">Free Software Directory</a> for free software that does the job already."
 msgstr ""
-"Nós as vezes recebemos software que faz substancialmente o mesmo que 
pacotes\n"
-"GNU existentes.  Embora apreciemos todas as ofertas, nós naturalmente 
gostamos\n"
+"Nos as vezes recebemos software que faz substancialmente o mesmo que 
pacotes\n"
+"GNU existentes.  Embora apreciemos todas as ofertas, nas naturalmente 
gostamos\n"
 "de encorajar programadores para gastar seu tempo escrevendo software para\n"
-"fazer novas coisas, não apenas as já solucionadas.  Então, antes de iniciar 
um \n"
+"fazer novas coisas, nao apenas os ja solucionados. Entao, antes de iniciar um 
\n"
 "programa novo, por favor cheque o <a \n"
-"href=\"http://directory.fsf.org/\";>Diretório do Software Livre</a> por 
software \n"
-"livre que já faz o trabalho."
+"href=\"http://directory.fsf.org/\";>Diretorio do Software Livre</a> por 
software \n"
+"livre que ja faz o trabalho."
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
 "We can offer <a href=\"/software/devel.html\">some resources</a> to help GNU "
 "software developers."
 msgstr ""
-"Nós podemos oferecer <a href=\"/software/devel.html\">alguns recursos</a> 
para \n"
+"Nos podemos oferecer <a href=\"/software/devel.html\">alguns recursos</a> "
+"para \n"
 "ajudar desenvolvedores de software."
 
 #. type: Content of: <ul><li>
 msgid "Write documentation for GNU software."
-msgstr "Escreva documentação para software GNU."
+msgstr "Escreva documentacao para software GNU."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -219,45 +231,48 @@
 "distribution contains only free software, so it can be included on the <a "
 "href=\"/distros/free-distros.html\">list of free distributions</a>."
 msgstr ""
-"Volutarios como &ldquo;Verificador de Liberdade&rdquo; se uma distribuição \n"
+"Voluntarios como &ldquo;Verificador de Liberdade&rdquo; se uma "
+"distribuicao \n"
 "contem apenas software livre, assim ela pode ser incluida na <a \n"
-"\"href=\"/distros/free-distros.html\">lista de distribuições livres</a>."
+"\"href=\"/distros/free-distros.html\">lista de distribuicoes livres</a>."
 
 #. type: Content of: <ul><li>
 msgid ""
-"Volunteer as a GNU Webmaster by completing the <a "
-"href=\"http://www.gnu.org/server/standards/webmaster-quiz.html\";> webmaster "
-"quiz</a>."
+"Volunteer as a GNU Webmaster by completing the <a href=\"http://www.gnu.org/";
+"server/standards/webmaster-quiz.html\"> webmaster quiz</a>."
 msgstr ""
 "Voluntario como Webmaster GNU completando <a \n"
-"href=\"http://www.gnu.org/server/standards/webmaster-quiz.html\";> webmaster 
\n"
-"quiz</a>.\""
+"href=\"http://www.gnu.org/server/standards/webmaster-quiz.html\";> "
+"webmaster \n"
+"quiz</a>."
 
 #. type: Content of: <ul><li>
 msgid ""
 "Translate the GNU Web site into other languages.  More information about the "
-"issue can be found at the <a "
-"href=\"/server/standards/README.translations.html\">Guide to Translating the "
-"www.gnu.org Web Pages</a>.  Write to <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> "
-"if you want to help."
+"issue can be found at the <a href=\"/server/standards/README.translations."
+"html\">Guide to Translating the www.gnu.org Web Pages</a>.  Write to <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a> if "
+"you want to help."
 msgstr ""
-"Traduza o site web GNU para outras linguas.  Mais informação sobre a questão 
\n"
+"Traduza o site web GNU para outras linguas.  Mais informacao sobre a "
+"questao \n"
 "pode ser encontrada em <a \n"
 "href=\"/server/standards/README.translations.html\">Guia para traduzir \n"
 "Paginas Web www.gnu.org</a>.  Escreva para <a \n"
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> \n"
+"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
+"a> \n"
 "se voce quer ajudar."
 
 #. type: Content of: <ul><li>
 msgid "Tell others about the GNU Project and the Free Software Foundation by:"
-msgstr "Conte aos outros do projeto GNU e da Fundação para o Software Livre 
atraves de:"
+msgstr ""
+"Conte aos outros do projeto GNU e da Fundacao para o Software Livre atraves "
+"de:"
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"informing your friends about the GNU <a "
-"href=\"/philosophy/philosophy.html\">philosophy</a> and <a "
-"href=\"/software/software.html\">software</a>."
+"informing your friends about the GNU <a href=\"/philosophy/philosophy.html"
+"\">philosophy</a> and <a href=\"/software/software.html\">software</a>."
 msgstr ""
 "Informando seus amugos sobre a <a \n"
 "href=\"/philosophy/philosophy.html\">filosofia</a> GNU e o <a \n"
@@ -269,40 +284,48 @@
 "really <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>: that is, the GNU "
 "system, plus Linux, the kernel.  Simply making a consistent and unfailing "
 "distinction between GNU/Linux (the whole system) and Linux (the kernel) when "
-"you write or speak about the system will <a "
-"href=\"/gnu/why-gnu-linux.html\">help us greatly</a>, while taking very "
-"little time once you have unlearned the old habit."
-msgstr ""
-"Informando seus amigos que o sistema operacional &ldquo;Linux&rdquo é em \n"
-"realidade <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>: que é o sistema 
\n"
-"GNU, mais Linux, o kernel. Simplesmente fazendo uma distinção consistente e 
\n"
-"infalivel entre GNU/Linux (todo o sistema) e e Linux (o kernel) quando voce 
\n"
+"you write or speak about the system will <a href=\"/gnu/why-gnu-linux.html"
+"\">help us greatly</a>, while taking very little time once you have "
+"unlearned the old habit."
+msgstr ""
+"Informando seus amigos que o sistema operacional &ldquo;Linux&rdquo e em \n"
+"realidade <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>: que e o "
+"sistema \n"
+"GNU, mais Linux, o kernel. Simplesmente fazendo uma distincao consistente "
+"e \n"
+"infalivel entre GNU/Linux (todo o sistema) e e Linux (o kernel) quando "
+"voce \n"
 "escrever ou falar sobre o sistema, <a \n"
-"href=\"/gnu/why-gnu-linux.html\">vai nos ajudar muito</a>, vai levar pouco 
tempo\n"
+"href=\"/gnu/why-gnu-linux.html\">vai nos ajudar muito</a>, vai levar pouco "
+"tempo\n"
 "para voce esquecer o velho habito."
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"by both <a href=\"/help/linking-gnu.html\">adding a link to GNU's home "
-"page</a> to your home pages, and suggesting that others do likewise."
+"by both <a href=\"/help/linking-gnu.html\">adding a link to GNU's home page</"
+"a> to your home pages, and suggesting that others do likewise."
 msgstr ""
-"<a href=\"/help/linking-gnu.html\">Adicione um link para a pagina web 
GNU</a>, desde suas paginas web, \n"
-"e sugira que os outros façam o mesmo."
+"<a href=\"/help/linking-gnu.html\">Adicione um link para a pagina web GNU</"
+"a>, desde suas paginas web, \n"
+"e sugira que os outros facam o mesmo."
 
 #. type: Content of: <ul><li>
 msgid ""
 "When you are talking with people that don't value freedom and community, you "
-"can show them the many practical advantages of free software (see <a "
-"href=\"http://www.dwheeler.com/oss_fs_why.html\";>Why Open Source / Free "
-"Software? Look at the Numbers!</a> for some useful evidence).  But keep "
-"mentioning the ethical issues too! Don't change your voice into an "
-"open-source voice just to cater to others."
-msgstr ""
-"Quando falar com pessoas que não valorizam a liberdade e a comunidade, voce 
\n"
-"pode mostrar a eles muitas das vantagens praticas do software livre (olhe <a 
\n"
+"can show them the many practical advantages of free software (see <a href="
+"\"http://www.dwheeler.com/oss_fs_why.html\";>Why Open Source / Free Software? "
+"Look at the Numbers!</a> for some useful evidence).  But keep mentioning the "
+"ethical issues too! Don't change your voice into an open-source voice just "
+"to cater to others."
+msgstr ""
+"Quando falar com pessoas que nao valorizam a liberdade e a comunidade, "
+"voce \n"
+"pode mostrar a eles muitas das vantagens praticas do software livre (olhe "
+"<a \n"
 "href=\"http://www.dwheeler.com/oss_fs_why.html\";>Why Open Source / Free \n"
 "Software? Look at the Numbers!</a> para algumas evidencias uteis). Mas, \n"
-"fique mencionando as questões eticas tambem!  Não mude sua voz para uma vóz 
\n"
+"fique mencionando as questoes eticas tambem!  Nao mude sua voz para uma "
+"voz \n"
 "open-source apenas para atender os outros."
 
 #. type: Content of: <ul><li>
@@ -312,11 +335,13 @@
 #. type: Content of: <ul><li><ul><li>
 msgid ""
 "making a donation, either <a href=\"http://donate.fsf.org/\";>directly to the "
-"FSF</a> or <a "
-"href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr\";>via Flattr</a>."
+"FSF</a> or <a href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr";
+"\">via Flattr</a>."
 msgstr ""
-"Fazendo uma doação <a href=\"http://donate.fsf.org/\";>diretamente para a 
FSF</a>\n"
-"ou <a href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr\";>via 
Flattr</a>."
+"Fazendo uma doacao <a href=\"http://donate.fsf.org/\";>diretamente para a "
+"FSF</a>\n"
+"ou <a href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr\";>via "
+"Flattr</a>."
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
@@ -328,20 +353,22 @@
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
-"choosing the FSF as a beneficiary in your <a "
-"href=\"http://www.affero.com/ca/fsf\";>Affero page</a>, linking to your FSF "
-"Affero page in your email signature, software project, and writings."
+"choosing the FSF as a beneficiary in your <a href=\"http://www.affero.com/ca/";
+"fsf\">Affero page</a>, linking to your FSF Affero page in your email "
+"signature, software project, and writings."
 msgstr ""
 "Escolhendo a FSF como beneficiaria na sua <a \n"
 "href=\"http://www.affero.com/ca/fsf\";>pagina Affero</a>, likando para a sua\n"
-"pagina Affero FSF em sua assinatura de email, projeto de software, e 
escritos."
+"pagina Affero FSF em sua assinatura de email, projeto de software, e "
+"escritos."
 
 #. type: Content of: <ul><li><ul><li>
 msgid ""
 "<a href=\"http://order.fsf.org/\";>ordering</a> manuals, t-shirts, stickers "
 "and gear from the FSF."
 msgstr ""
-"<a href=\"http://order.fsf.org/\";>Comprando</a> manuais, camisetas, adesivos 
\n"
+"<a href=\"http://order.fsf.org/\";>Comprando</a> manuais, camisetas, "
+"adesivos \n"
 "e equipamentos da FSF."
 
 #. type: Content of: <ul><li><ul><li>
@@ -349,7 +376,8 @@
 "convincing your office to <a href=\"http://order.fsf.org/\";>order</a> "
 "manuals and t-shirts from the FSF."
 msgstr ""
-"Convencendo seu escritório de <a href=\"http://order.fsf.org/\";>comprar</a> 
\n"
+"Convencendo seu escritorio de <a href=\"http://order.fsf.org/\";>comprar</"
+"a> \n"
 "manuais e camisetas da FSF."
 
 #. type: Content of: <ul><li><ul><li>
@@ -359,47 +387,49 @@
 "Foundation</a> or some other free software development project. By funding "
 "development, you can advance the world of free software."
 msgstr ""
-"<a href=\"/philosophy/selling.html\">vendendo software livre</a> e doando 
uma\n"
-"parte dos lucros para a <a href=\"/fsf/fsf.html\">Fundação para o Software \n"
+"<a href=\"/philosophy/selling.html\">vendendo software livre</a> e doando "
+"uma\n"
+"parte dos lucros para a <a href=\"/fsf/fsf.html\">Fundacao para o Software \n"
 "Livre</a> ou algum outro projeto de desenvolvimento de software\n"
-"livre. Financiando o desenvolvimento, voce pode avançar o mundo do software 
livre."
+"livre. Financiando o desenvolvimento, voce pode avancar o mundo do software "
+"livre."
 
 #. type: Content of: <ul><li><ul><li><p>
 msgid ""
 "<strong>Distributing free software is an opportunity to raise funds for "
 "development.  Don't waste it!</strong>"
 msgstr ""
-"<strong>Distribuir software livre é uma forma de obter fundos para o\n"
-"desenvolvimento. Não a desperdice!</strong>"
+"<strong>Distribuir software livre e uma forma de obter fundos para o\n"
+"desenvolvimento. Nao a desperdice!</strong>"
 
 #. type: Content of: <ul><li>
 msgid ""
-"Volunteer to make sure that essays from our <a "
-"href=\"/philosophy/philosophy.html\">philosophy page</a> and other GNU URLs "
-"are on and/or linked from WWW directory, portal, and various hierarchical "
-"web index sites, such as Yahoo!, dmoz.org, and Google.  Get these sites to "
-"add detailed entries about our different web pages.  Make sure that essays "
-"from our <a href=\"/philosophy/philosophy.html\">philosophy page</a> and "
-"other GNU URLs are linked to often in the appropriate categories.  If you'd "
-"like to help us with this task, please contact the GNU Volunteer "
-"Coordinators <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr ""
-"Seja voluntário para garantir que os artigos em nossa\n"
-"<a href=\"/philosophy/philosophy.pt-br.html\">página de filosofia</a>\n"
-"e outras URLs do site do GNU estejam ou sejam linkadas por diretórios\n"
-"da internet, portais, e vários índices hierárquivos da WWW como o Yahoo!,\n"
-"dmoz.org e o Google. Faça com que esses sites adicionem registros\n"
-"detalhados sobre nossas diferentes páginas. Tenha certeza de que os\n"
+"Volunteer to make sure that essays from our <a href=\"/philosophy/philosophy."
+"html\">philosophy page</a> and other GNU URLs are on and/or linked from WWW "
+"directory, portal, and various hierarchical web index sites, such as Yahoo!, "
+"dmoz.org, and Google.  Get these sites to add detailed entries about our "
+"different web pages.  Make sure that essays from our <a href=\"/philosophy/"
+"philosophy.html\">philosophy page</a> and other GNU URLs are linked to often "
+"in the appropriate categories.  If you'd like to help us with this task, "
+"please contact the GNU Volunteer Coordinators <a href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>."
+msgstr ""
+"Seja voluntario para garantir que os artigos em nossa\n"
+"<a href=\"/philosophy/philosophy.pt-br.html\">pagina de filosofia</a>\n"
+"e outras URLs do site do GNU estejam ou sejam linkadas por diretorios\n"
+"da internet, portais, e varios indices hierarquivos da WWW como o Yahoo!,\n"
+"dmoz.org e o Google. Faca com que esses sites adicionem registros\n"
+"detalhados sobre nossas diferentes paginas. Tenha certeza de que os\n"
 "artigos em nossa\n"
-"<a href=\"/philosophy/philosophy.pt-br.html\">página de filosfia</a>\n"
+"<a href=\"/philosophy/philosophy.pt-br.html\">pagina de filosfia</a>\n"
 "e outras URLS do site do GNU sejam listadas nas categorias apropriadas.\n"
-"Se você gostaria de nos ajudar nesta tarefa, por favor contacte os\n"
-"Coordenadores de Voluntários GNU\n"
+"Se voce gostaria de nos ajudar nesta tarefa, por favor contacte os\n"
+"Coordenadores de Voluntarios GNU\n"
 "<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 
 #. type: Content of: <ul><li>
 msgid "Donate <a href=\"/help/help-hardware.html\">hardware</a> to the FSF."
-msgstr "Dõe <a href=\"/help/help-hardware.html\">hardware</a> para a FSF."
+msgstr "Doe <a href=\"/help/help-hardware.html\">hardware</a> para a FSF."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -412,12 +442,12 @@
 #. type: Content of: <ul><li>
 msgid ""
 "If you or your company work supporting or developing free software in some "
-"way, you can list yourself (or your company) in the <a "
-"href=\"/prep/service.html\">GNU Service Directory</a>."
+"way, you can list yourself (or your company) in the <a href=\"/prep/service."
+"html\">GNU Service Directory</a>."
 msgstr ""
-"Se você ou sua empresa dá suporte ou desenvolve software livre de alguma \n"
+"Se voce ou sua empresa da suporte ou desenvolve software livre de alguma \n"
 "maneira, voce pode listar voce mesmo (ou sua empresa) no <a \n"
-"href=\"/prep/service.html\">Diretório de Serviço GNU</a>."
+"href=\"/prep/service.html\">Diretorio de Servico GNU</a>."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -425,19 +455,21 @@
 "you can advertise on our <a href=\"http://www.fsf.org/resources/jobs/\";>Free "
 "Software Job Page</a>."
 msgstr ""
-"Se voce tem uma empresa que necessita contratar pessoas para trabalharem 
com\n"
+"Se voce tem uma empresa que necessita contratar pessoas para trabalharem "
+"com\n"
 "software livre, voce pode anunciar em nossa <a\n"
-"href=\"http://www.fsf.org/resources/jobs/\";>Pagina de Trabalho com Software 
\n"
+"href=\"http://www.fsf.org/resources/jobs/\";>Pagina de Trabalho com "
+"Software \n"
 "Livre</a>."
 
 #. type: Content of: <ul><li>
 msgid ""
 "Offer to contact companies looking for additional job postings to put on our "
 "<a href=\"http://www.fsf.org/resources/jobs/\";>Free Software Job Page</a>.  "
-"If you would be interested in this, please contact <a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+"If you would be interested in this, please contact <a href=\"mailto:job-";
+"address@hidden">&lt;address@hidden&gt;</a>."
 msgstr ""
-"Ofereça-se para contatar empresas procurando por postagens adicionais de\n"
+"Ofereca-se para contatar empresas procurando por postagens adicionais de\n"
 "empregos em nossa <a href=\"http://www.fsf.org/resources/jobs/\";>Pagina de\n"
 "Trabalho com Software Livre</a>.  \n"
 "Se voce se enteressa por isto, favor contatar <a \n"
@@ -450,9 +482,9 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send FSF &amp; GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
"
-"href=\"/contact/\">other ways to contact</a> the FSF."
+"Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF."
 msgstr ""
 "Por favor envie &amp; consultas sobre GNU para <a \n"
 "href=\"mailto:address@hidden";><em>address@hidden<</em></a>.  Existem <a \n"
@@ -460,10 +492,10 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
 msgstr ""
-"Por favor envie links quebrados e outras correções ou sugestões para <a \n"
+"Por favor envie links quebrados e outras correcoes ou sugestoes para <a \n"
 "href=\"mailto:address@hidden";><em>address@hidden</em></a>"
 
 #. type: Content of: <div><p>
@@ -474,12 +506,13 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"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>."
-msgstr ""
-"Esta pagina é licensiada sob a licença <a rel=\"license\" \n"
-"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative Commons 
\n"
+"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>."
+msgstr ""
+"Esta pagina e licensiada sob a licenca <a rel=\"license\" \n"
+"href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Creative "
+"Commons \n"
 "Attribution-NoDerivs 3.0 United States License</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -489,9 +522,12 @@
 "<a href=\"http://freedomphilosophy.eu5.org\";>Fabio J. Gonzalez</a>\n"
 "<a href=\"address@hidden">&lt;address@hidden&gt;</a>\n"
 "<br>\n"
-"Fernando Lozano <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>"
+"Fernando Lozano <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"br&gt;</a>"
 
 #.  timestamp start 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid "Updated:"
 msgid "Updated:"
-msgstr ""
+msgstr "Última atualização:"

Index: licenses/license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- licenses/license-list.ru.html       15 Sep 2012 19:50:18 -0000      1.17
+++ licenses/license-list.ru.html       15 Sep 2012 21:27:51 -0000      1.18
@@ -2209,15 +2209,7 @@
  <p><!-- timestamp start -->
 Обновлено:
 
-<<<<<<< license-list.ru.html
-<<<<<<< license-list.ru.html
-$Date: 2012/09/15 19:50:18 $
-=======
-$Date: 2012/09/15 19:50:18 $
->>>>>>> 1.15
-=======
-$Date: 2012/09/15 19:50:18 $
->>>>>>> 1.16
+$Date: 2012/09/15 21:27:51 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/license-list.ru-en.html 15 Sep 2012 19:51:31 -0000      1.15
+++ licenses/po/license-list.ru-en.html 15 Sep 2012 21:28:01 -0000      1.16
@@ -2220,15 +2220,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-<<<<<<< license-list.ru-en.html
-<<<<<<< license-list.ru-en.html
-$Date: 2012/09/15 19:51:31 $
-=======
-$Date: 2012/09/15 19:51:31 $
->>>>>>> 1.13
-=======
-$Date: 2012/09/15 19:51:31 $
->>>>>>> 1.14
+$Date: 2012/09/15 21:28:01 $
 <!-- timestamp end -->
 </p>
 </div>

Index: people/past-webmasters.de.html
===================================================================
RCS file: /web/www/www/people/past-webmasters.de.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- people/past-webmasters.de.html      15 Sep 2012 19:52:58 -0000      1.3
+++ people/past-webmasters.de.html      15 Sep 2012 21:28:09 -0000      1.4
@@ -7,6 +7,12 @@
 <title>GNU-Webmaster: gestern und heute - GNU-Projekt - Free Software 
Foundation</title>
 
 <!--#include virtual="/server/banner.de.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/people/po/past-webmasters.de.po";>
+ http://www.gnu.org/people/po/past-webmasters.de.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/people/past-webmasters.html" -->
+ <!--#set var="DIFF_FILE" value="/people/po/past-webmasters.de-diff.html" -->
+ <!--#include virtual="/server/outdated.de.html" -->
 <!--#include virtual="/people/po/past-webmasters.translist" -->
 <h2>GNU-Webmaster: gestern und heute</h2>
 
@@ -89,6 +95,13 @@
 überzeugen, Freie Software zu benutzen und der GNU-Philosophie zu folgen; er
 ist auch Mitglied im spanischen Übersetzungsteam.</dd>
 
+         <dt><strong><a href="http://freedomphilosophy.eu5.org";>Fabio
+J. Gonzalez</a></strong> <a href=
+"mailto:address@hidden";>&lt;address@hidden&gt;</a></dt>
+
+          <dd>Fabio is a brazilian GNU webmaster. He is also a programmer and 
worry about
+the freedom of computer users.</dd>
+
           <dt><strong><a href="http://francoiacomella.org/";>Franco 
Iacomella</a></strong>
 <a href="mailto:address@hidden";>&lt;yaco at gnu.org&gt;</a></dt>
 
@@ -354,7 +367,7 @@
 <!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/09/15 19:52:58 $
+$Date: 2012/09/15 21:28:09 $
 
 <!-- timestamp end -->
 </p>

Index: people/past-webmasters.ja.html
===================================================================
RCS file: /web/www/www/people/past-webmasters.ja.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- people/past-webmasters.ja.html      15 Sep 2012 19:52:59 -0000      1.9
+++ people/past-webmasters.ja.html      15 Sep 2012 21:28:09 -0000      1.10
@@ -7,6 +7,12 @@
 <title>GNUのウェブマスタ - GNUプロジェクト - 
フリーソフトウェアファウンデーション</title>
 
 <!--#include virtual="/server/banner.ja.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="http://www.gnu.org/people/po/past-webmasters.ja.po";>
+ http://www.gnu.org/people/po/past-webmasters.ja.po</a>' -->
+ <!--#set var="ORIGINAL_FILE" value="/people/past-webmasters.html" -->
+ <!--#set var="DIFF_FILE" value="/people/po/past-webmasters.ja-diff.html" -->
+ <!--#include virtual="/server/outdated.ja.html" -->
 <!--#include virtual="/people/po/past-webmasters.translist" -->
 <h2>GNUのウェブマスタ、過去と現在</h2>
 
@@ -81,6 +87,13 @@
 
           
<dd>ExalはGNUプロジェクトのウェブマスタで、回りの人々
に自由ソフトウェアを使うよう説得しようとし、GNUの理念にしたがっています。スペイン語翻訳チーãƒ
 ã¨ä»•äº‹ã‚‚しています。</dd>
 
+         <dt><strong><a href="http://freedomphilosophy.eu5.org";>Fabio
+J. Gonzalez</a></strong> <a href=
+"mailto:address@hidden";>&lt;address@hidden&gt;</a></dt>
+
+          <dd>Fabio is a brazilian GNU webmaster. He is also a programmer and 
worry about
+the freedom of computer users.</dd>
+
           <dt><strong><a href="http://francoiacomella.org/";>Franco 
Iacomella</a></strong>
 <a href= "mailto:address@hidden";>&lt;yaco at gnu.org&gt;</a></dt>
 
@@ -319,7 +332,7 @@
 <!-- timestamp start -->
 最終更新:
 
-$Date: 2012/09/15 19:52:59 $
+$Date: 2012/09/15 21:28:09 $
 
 <!-- timestamp end -->
 </p>

Index: people/po/past-webmasters.ja.po
===================================================================
RCS file: /web/www/www/people/po/past-webmasters.ja.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- people/po/past-webmasters.ja.po     31 Aug 2012 03:17:23 -0000      1.14
+++ people/po/past-webmasters.ja.po     15 Sep 2012 21:28:21 -0000      1.15
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: past-webmasters.html\n"
-"POT-Creation-Date: 2012-08-11 20:25-0300\n"
+"POT-Creation-Date: 2012-09-15 15:54-0300\n"
 "PO-Revision-Date: 2012-08-31 12:05+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-09-15 15:54-0300\n"
 
 #. type: Content of: <title>
 msgid "GNU's Webmasters - GNU Project - Free Software Foundation"
@@ -204,6 +205,25 @@
 "います。"
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<strong><a href=\"http://francoiacomella.org/\";>Franco Iacomella</a></"
+#| "strong> <a href= \"mailto:address@hidden";>&lt;yaco at gnu.org&gt;</a>"
+msgid ""
+"<strong><a href=\"http://freedomphilosophy.eu5.org\";>Fabio J. Gonzalez</a></"
+"strong> <a href= \"mailto:address@hidden";>&lt;address@hidden&gt;"
+"</a>"
+msgstr ""
+"<strong><a href=\"http://francoiacomella.org/\";>Franco Iacomella</a></"
+"strong> <a href= \"mailto:address@hidden";>&lt;yaco at gnu.org&gt;</a>"
+
+#. type: Content of: <dl><dd>
+msgid ""
+"Fabio is a brazilian GNU webmaster. He is also a programmer and worry about "
+"the freedom of computer users."
+msgstr ""
+
+#. type: Content of: <dl><dt>
 msgid ""
 "<strong><a href=\"http://francoiacomella.org/\";>Franco Iacomella</a></"
 "strong> <a href= \"mailto:address@hidden";>&lt;yaco at gnu.org&gt;</a>"

Index: philosophy/right-to-read.it.html
===================================================================
RCS file: /web/www/www/philosophy/right-to-read.it.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/right-to-read.it.html    15 Sep 2012 19:54:36 -0000      1.31
+++ philosophy/right-to-read.it.html    15 Sep 2012 21:28:32 -0000      1.32
@@ -5,12 +5,6 @@
 <title>Il diritto a leggere - Progetto GNU - Free Software Foundation 
(FSF)</title>
 
 <!--#include virtual="/server/banner.it.html" -->
-<!--#set var="PO_FILE"
- value='<a href="http://www.gnu.org/philosophy/po/right-to-read.it.po";>
- http://www.gnu.org/philosophy/po/right-to-read.it.po</a>' -->
- <!--#set var="ORIGINAL_FILE" value="/philosophy/right-to-read.html" -->
- <!--#set var="DIFF_FILE" value="/philosophy/po/right-to-read.it-diff.html" -->
- <!--#include virtual="/server/outdated.it.html" -->
 <!--#include virtual="/philosophy/po/right-to-read.translist" -->
 <h2>Il diritto a leggere</h2>
 
@@ -312,18 +306,11 @@
 firmando un <a href="http://www.nature.com/principles/viewTermsOfUse";>
 contratto che vi proibisce di prestarlo ad altri</a> e che l'editore può
 ritirare in qualsiasi momento.</li>
-<<<<<<< right-to-read.it.html
-<li><a
-href="http://www.zdnet.com/news/seybold-opens-chapter-on-digital-books/103151";>Electronic
-Publishing:</a> An article about distribution of books in electronic form,
-and copyright issues affecting the right to read a copy.</li>
-=======
 <li><a
 
href="http://www.zdnet.com/news/seybold-opens-chapter-on-digital-books/103151";>Electronic
 Publishing:</a> un articolo sulla distribuzione dei libri in forma
 elettronica, e questioni di diritti di copia con effetti sul diritto a
 leggerli.</li>
->>>>>>> 1.30
 <li><a
 
href="http://www.microsoft.com/en-us/news/press/1999/Aug99/SeyboldPR.aspx";>Books
 inside Computers:</a> software per controllare chi può leggere libri e
@@ -374,15 +361,9 @@
 <ul>
        <li><a href="/philosophy/philosophy.html">Filosofia del progetto 
GNU</a></li>
        <li><a
-<<<<<<< right-to-read.it.html
-href="http://www.computerworld.com/s/article/49358/Copy_Protection_Just_Say_No";
-id="COPYPROCTECTION">Copy Protection: Just Say No</a>, Published in Computer
-World.</li>
-=======
 href="http://www.computerworld.com/s/article/49358/Copy_Protection_Just_Say_No";
 id="COPYPROCTECTION">Copy Protection: Just Say No</a>, Pubblicato in
 Computer World.</li>
->>>>>>> 1.30
 </ul>
 
 
@@ -435,11 +416,7 @@
 <!-- timestamp start -->
 Ultimo aggiornamento:
 
-<<<<<<< right-to-read.it.html
-$Date: 2012/09/15 19:54:36 $
-=======
-$Date: 2012/09/15 19:54:36 $
->>>>>>> 1.30
+$Date: 2012/09/15 21:28:32 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/right-to-read.ru.html
===================================================================
RCS file: /web/www/www/philosophy/right-to-read.ru.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/right-to-read.ru.html    15 Sep 2012 19:54:37 -0000      1.8
+++ philosophy/right-to-read.ru.html    15 Sep 2012 21:28:32 -0000      1.9
@@ -5,12 +5,6 @@
 <title>Право прочесть - проект GNU - Фонд 
свободного программного обеспечения</title>
 
 <!--#include virtual="/server/banner.ru.html" -->
-<!--#set var="PO_FILE"
- value='<a href="http://www.gnu.org/philosophy/po/right-to-read.ru.po";>
- http://www.gnu.org/philosophy/po/right-to-read.ru.po</a>' -->
- <!--#set var="ORIGINAL_FILE" value="/philosophy/right-to-read.html" -->
- <!--#set var="DIFF_FILE" value="/philosophy/po/right-to-read.ru-diff.html" -->
- <!--#include virtual="/server/outdated.ru.html" -->
 <!--#include virtual="/philosophy/po/right-to-read.translist" -->
 <h2>Право прочесть</h2>
 
@@ -312,17 +306,10 @@
 href="http://www.nature.com/principles/viewTermsOfUse";>договор об 
том, что
 вы не одолжите его никому другому</a>, 
причем издатель может расторгнуть
 этот договор, когда пожелает.</li>
-<<<<<<< right-to-read.ru.html
-<li><a
-href="http://www.zdnet.com/news/seybold-opens-chapter-on-digital-books/103151";>Electronic
-Publishing:</a> An article about distribution of books in electronic form,
-and copyright issues affecting the right to read a copy.</li>
-=======
 <li><a
 
href="http://www.zdnet.com/news/seybold-opens-chapter-on-digital-books/103151";>Электронная
 публикация</a>: статья о распространении 
книг в электронном виде и вопросах
 авторского права, касающихся права 
прочесть копию.</li>
->>>>>>> 1.7
 <li><a
 href="http://www.microsoft.com/en-us/news/press/1999/Aug99/SeyboldPR.aspx";>
 Книги внутри компьютеров:</a> программы для 
контроля того, кто может читать
@@ -377,15 +364,9 @@
 <ul>
        <li><a href="/philosophy/philosophy.html">Философия 
проекта GNU</a></li>
        <li><a
-<<<<<<< right-to-read.ru.html
-href="http://www.computerworld.com/s/article/49358/Copy_Protection_Just_Say_No";
-id="COPYPROCTECTION">Copy Protection: Just Say No</a>, Published in Computer
-World.</li>
-=======
 href="http://www.computerworld.com/s/article/49358/Copy_Protection_Just_Say_No";
 id="COPYPROCTECTION">Защита от копирования: просто 
скажите
 &ldquo;нет&rdquo;</a>, опубликовано в 
&ldquo;Компьютер уорлд&rdquo;.</li>
->>>>>>> 1.7
 </ul>
 
 
@@ -442,11 +423,7 @@
 <!-- timestamp start -->
 Обновлено:
 
-<<<<<<< right-to-read.ru.html
-$Date: 2012/09/15 19:54:37 $
-=======
-$Date: 2012/09/15 19:54:37 $
->>>>>>> 1.7
+$Date: 2012/09/15 21:28:32 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/right-to-read.it-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.it-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/right-to-read.it-en.html      13 Sep 2012 00:28:38 -0000      
1.8
+++ philosophy/po/right-to-read.it-en.html      15 Sep 2012 21:28:55 -0000      
1.9
@@ -381,7 +381,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/13 00:28:38 $
+$Date: 2012/09/15 21:28:55 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/right-to-read.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.it.po,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- philosophy/po/right-to-read.it.po   15 Sep 2012 19:56:14 -0000      1.58
+++ philosophy/po/right-to-read.it.po   15 Sep 2012 21:28:55 -0000      1.59
@@ -8,13 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: right-to-read.html\n"
-<<<<<<< right-to-read.it.po
 "POT-Creation-Date: 2012-09-13 10:17-0300\n"
 "PO-Revision-Date: 2012-06-01 23:16+0100\n"
-=======
-"POT-Creation-Date: 2012-09-11 20:26-0300\n"
-"PO-Revision-Date: 2012-09-12 23:24+0100\n"
->>>>>>> 1.57
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\n"
 "Language: \n"

Index: philosophy/po/right-to-read.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.ru-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/right-to-read.ru-en.html      13 Sep 2012 00:28:38 -0000      
1.6
+++ philosophy/po/right-to-read.ru-en.html      15 Sep 2012 21:28:55 -0000      
1.7
@@ -381,7 +381,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2012/09/13 00:28:38 $
+$Date: 2012/09/15 21:28:55 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/right-to-read.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.ru.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/po/right-to-read.ru.po   15 Sep 2012 19:56:14 -0000      1.12
+++ philosophy/po/right-to-read.ru.po   15 Sep 2012 21:28:56 -0000      1.13
@@ -8,13 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: right-to-read.html\n"
-<<<<<<< right-to-read.ru.po
 "POT-Creation-Date: 2012-09-13 10:17-0300\n"
 "PO-Revision-Date: 2012-05-31 17:17+0000\n"
-=======
-"POT-Creation-Date: 2012-09-11 20:26-0300\n"
-"PO-Revision-Date: 2012-09-12 17:17+0000\n"
->>>>>>> 1.11
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
 "Language: ru\n"

Index: po/home.es.po
===================================================================
RCS file: /web/www/www/po/home.es.po,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- po/home.es.po       15 Sep 2012 19:57:28 -0000      1.246
+++ po/home.es.po       15 Sep 2012 21:29:14 -0000      1.247
@@ -1,45 +1,40 @@
-# Spanish translation of http://www.gnu.org/home.html
-# Copyright (C) 2004, 2006-2012 Free Software Foundation, Inc.
-# This file is distributed under the same license as the original article.
-# Emilio Silva, 2004.
-# Miguel Vázquez Gocobachi <address@hidden>, 2006.
-# Xavier Reina <address@hidden>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
+# Master Compendium for Spanish translations of gnu.org articles.
+# Copyright (C) 2012 Free Software Foundation, Inc.
+# This file is distributed under the same license as the articles in 
www.gnu.org.
 # Dora Scilipoti <dora AT gnu DOT org>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: home.es\n"
-"Report-Msgid-Bugs-To: \n"
-<<<<<<< home.es.po
+"Project-Id-Version: master\n"
 "POT-Creation-Date: 2012-09-13 10:22-0300\n"
-"PO-Revision-Date: 2012-06-30 08:35+0100\n"
-"Last-Translator: Dora Scilipoti <dorascilipoti at gmail.com>\n"
-=======
-"POT-Creation-Date: 2012-09-10 15:01-0300\n"
-"PO-Revision-Date: 2012-09-14 14:54+0100\n"
+"PO-Revision-Date: 2012-06-05 22:56+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
->>>>>>> 1.245
 "Language-Team: Spanish <address@hidden>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-03-02 04:26-0500\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
-# type: Content of: <title>
 #. type: Content of: <title>
 msgid "The GNU Operating System"
-msgstr "El sistema operativo GNU"
+msgstr ""
 
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
+# | GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free
+# | Software, Operating System, GNU Kernel, [-HURD,-] GNU [-HURD,-] Hurd
+#, fuzzy
+#| msgid ""
+#| "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free "
+#| "Software, Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
 "Operating System, GNU Kernel, GNU Hurd"
 msgstr ""
-"GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
-"sistema operativo, GNU Kernel, núcleo de GNU, HURD, GNU HURD"
+"GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Software Libre, "
+"Sistema Operativo, Núcleo GNU, HURD, GNU HURD, Hurd"
 
 # type: Attribute 'content' of: <meta>
 #. type: Attribute 'content' of: <meta>
@@ -54,41 +49,40 @@
 
 #. type: Attribute 'title' of: <link>
 msgid "Planet GNU"
-msgstr "Planet GNU"
+msgstr ""
 
 # type: Attribute 'title' of: <link>
 #. type: Attribute 'title' of: <link>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "What's New"
 msgid "What's New"
 msgstr "Novedades"
 
 # type: Attribute 'title' of: <link>
 #. type: Attribute 'title' of: <link>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "New Free Software"
 msgid "New Free Software"
 msgstr "Nuevo software libre"
 
-# type: Content of: <p>
 #. type: Content of: <p>
 msgid ""
 "Richard Stallman announced in September 1983 the plan to develop a free "
 "software Unix-like operating system called GNU. GNU is the only operating "
 "system developed specifically for the sake of users' freedom."
 msgstr ""
-"Richard Stallman anunció en setiembre de 1983 el plan de crear un sistema "
-"operativo de software libre del tipo Unix llamado GNU. GNU es el único "
-"sistema operativo creado específicamente para la libertad de los usuarios."
 
 #. type: Content of: <div>
 msgid ""
 "<object data=\"http://call.unitary-patent.eu/campaign/widget2/unitary-patent-";
 "juri-2012/horiz/en\" width=\"630\" height=\"200\"></object>"
 msgstr ""
-"<object data=\"http://call.unitary-patent.eu/campaign/widget2/unitary-patent-";
-"juri-2012/horiz/en\" width=\"630\" height=\"200\"></object>"
 
-# type: Content of: <table><tr><td><h2>
 #. type: Content of: <div><div><h2>
 msgid "What is GNU?"
-msgstr "¿Qué es GNU?"
+msgstr ""
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -97,27 +91,20 @@
 "href=\"/distros/free-distros.html\">Linux-based versions of GNU</a> which "
 "are entirely free software."
 msgstr ""
-"GNU es un sistema operativo similar a Unix que es <a href=\"/philosophy/free-"
-"sw.es.html\">software libre</a> y respeta su libertad. Puede instalar <a "
-"href=\"/distros/free-distros.es.html\">versiones de GNU basadas en Linux</a> "
-"que son completamente software libre."
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><p><a>
 msgid "<a href=\"/distros/screenshot.html\">"
-msgstr "<a href=\"/distros/screenshot.html\">"
+msgstr ""
 
-# type: Attribute 'alt' of: <div><div><p><a><img>
 #. type: Attribute 'alt' of: <div><div><p><a><img>
 msgid "Screenshot of GNU"
-msgstr "Capturas de pantalla de GNU"
+msgstr ""
 
 # type: Content of: <div><p>
 #. type: Content of: <div><div><div><h4>
 msgid "</a>"
 msgstr "</a>"
 
-# type: Content of: <table><tr><td><p>
 #. type: Content of: <div><div><p>
 msgid ""
 "The <a href=\"/gnu/gnu.html\">GNU Project</a> was launched in 1984 to "
@@ -126,23 +113,13 @@
 "html\"> \"GNU\" is pronounced <em>g'noo</em></a>, as one syllable, like "
 "saying \"grew\" but replacing the <em>r</em> with <em>n</em>."
 msgstr ""
-"El <a href=\"/gnu/gnu.es.html\">Proyecto GNU</a> se inició en 1984 para "
-"desarrollar el sistema GNU. El nombre «GNU» (que significa «ñu» en 
inglés) "
-"es un acrónimo recursivo de «¡GNU No es Unix!» y <a 
href=\"/pronunciation/"
-"pronunciation.html\">en español se pronuncia fonéticamente</a> como una "
-"sílaba sin vocal entre la <em>g</em> y la <em>n</em>."
 
-# type: Content of: <div><div><p>
 #. type: Content of: <div><div><p>
 msgid ""
 "A Unix-like operating system is a <a href=\"/software/\">software "
 "collection</a> of applications, libraries, and developer tools, plus a "
 "program to allocate resources and talk to the hardware, known as a kernel."
 msgstr ""
-"Los sistemas operativos similares a Unix se construyen a partir de un <a "
-"href=\"/software/\">conjunto de aplicaciones</a>, bibliotecas y herramientas "
-"de programación, además de un programa para alojar recursos e interactuar "
-"con el hardware, denominado núcleo."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -153,45 +130,36 @@
 "by millions, though many <a href=\"/gnu/gnu-linux-faq.html\"> call it \"Linux"
 "\" by mistake</a>."
 msgstr ""
-"<a href=\"/software/hurd/hurd.html\">Hurd, el núcleo propio de GNU</a>, 
está "
-"lejos de poderse usar en el día a día. Por este motivo, GNU se usa "
-"habitualmente con un núcleo denominado Linux. Esta combinación es el <a 
href="
-"\"/gnu/linux-and-gnu.es.html\"> <strong>sistema operativo GNU/Linux</"
-"strong></a>. GNU/Linux lo usan millones de personas, aunque muchos lo <a "
-"href=\"/gnu/gnu-linux-faq.es.html\">denominan «Linux» por error</a>."
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><p>
+# | <a [-href=\"/education/edu-cases.html\">Case Studies</a>-]
+# | {+href=\"/provide.html\">What we provide</a>.+}
+#, fuzzy
+#| msgid "<a href=\"/education/edu-cases.html\">Case Studies</a>"
 msgid "<a href=\"/provide.html\">What we provide</a>."
-msgstr "<a href=\"/provide.html\">Lo que proporcionamos</a>"
+msgstr "<a href=\"/education/edu-cases.html\">Casos de éxito</a>"
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><p>
 msgid "<a href=\"/distros/free-distros.html\">Download GNU now</a>"
-msgstr "<a href=\"/distros/free-distros.html\">¡Descargue GNU ahora!</a>"
+msgstr ""
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><div><h4><a>
 msgid ""
 "<a href=\"http://planet.gnu.org/\";>Planet GNU</a> <a href=\"http://planet.";
 "gnu.org/rss20.xml\">"
 msgstr ""
-"<a href=\"http://planet.gnu.org/\";>Planet GNU</a> <a href=\"http://planet.";
-"gnu.org/rss20.xml\">"
 
 #. type: Attribute 'alt' of: <div><div><div><h4><a><img>
 msgid "RSS Feed"
-msgstr "Feed RSS"
+msgstr ""
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><div><p>
 msgid "For more news, see <a href=\"http://planet.gnu.org/\";>Planet GNU</a>."
 msgstr ""
-"Para más noticias visite <a href=\"http://planet.gnu.org/\"; >Planet GNU</a>"
 
 #. type: Content of: <div><div><div><h4>
 msgid "GNU Guile"
-msgstr "Guile de GNU"
+msgstr ""
 
 #. type: Content of: <div><div><div><p>
 msgid ""
@@ -203,37 +171,26 @@
 "applications in.  <a href=\"http://www.gnu.org/software/guile/community.html";
 "\">Join the community now!</a>"
 msgstr ""
-"<a href=\"http://www.gnu.org/software/guile/\";>Guile de GNU</a> es el "
-"lenguaje de extensión oficial del sistema operativo GNU. La versión 2.0 se "
-"publicó el 16 de febrero de 2011 con <a href=\"http://www.gnu.org/software/";
-"guile/news.html\">muchas funcionalidades nuevas</a>. Su infraestructura de "
-"compilación, bibliotecas y el entorno dinámico de programación hacen que 
sea "
-"un gran lenguaje para programar aplicaciones.  <a href=\"http://www.gnu.org/";
-"software/guile/community.html\">¡Únete a la comunidad ahora!</a>"
 
-# type: Attribute 'title' of: <link>
 #. type: Content of: <div><div><div><h4>
 msgid "GNUstep"
-msgstr "GNUstep"
+msgstr ""
 
-# type: Content of: <table><tr><td><p>
 #. type: Content of: <div><div><div><p>
 msgid ""
 "<a href=\"http://www.gnustep.org/\";>GNUstep</a> is a fully-functional object-"
 "oriented development environment. We need developers to write and port "
 "applications to GNUstep so that we can make it a great experience for users."
 msgstr ""
-"<a href=\"http://www.gnustep.org/\";>GNUstep</a> es un entorno de "
-"programación orientado a objetos totalmente funcional. Necesitamos "
-"programadores para escribir y migrar aplicaciones a GNUstep para que podamos "
-"ofrecer una excelente experiencia a los usuarios."
 
-# type: Content of: <table><tr><td><h2>
+# type: Attribute 'title' of: <link>
 #. type: Content of: <div><div><h2>
+# | [-New-]{+What is+} Free Software{+?+}
+#, fuzzy
+#| msgid "New Free Software"
 msgid "What is Free Software?"
-msgstr "¿Qué es el software libre?"
+msgstr "Nuevo software libre"
 
-# type: Content of: <table><tr><td><p>
 #. type: Content of: <div><div><p>
 msgid ""
 "&ldquo;<a href=\"/philosophy/free-sw.html\">Free software</a>&rdquo; is a "
@@ -241,67 +198,45 @@
 "of &ldquo;free&rdquo; as in &ldquo;free speech&rdquo;, not as in &ldquo;free "
 "beer&rdquo;."
 msgstr ""
-"El «<a href=\"/philosophy/free-sw.es.html\">Software Libre</a>» es un 
asunto "
-"de libertad, no de precio. Para entender el concepto, debe pensarse en "
-"«libre» como en «libertad de expresión», no como en «cerveza gratis»."
 
-# type: Content of: <table><tr><td><p>
 #. type: Content of: <div><div><p>
 msgid ""
 "<strong>Free software is a matter of the users' freedom to run, copy, "
 "distribute, study, change and improve the software.</strong> More precisely, "
 "it refers to four kinds of freedom, for the users of the software:"
 msgstr ""
-"<strong>El software libre es una cuestión de libertad de los usuarios para "
-"ejecutar, copiar, distribuir, estudiar, cambiar y modificar el software</"
-"strong>. Más concretamente, se refiere a los cuatro tipos de libertades para 
"
-"los usuarios de software:"
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid "The freedom to run the program, for any purpose (freedom 0)."
-msgstr "La libertad de usar el programa, con cualquier propósito (libertad 
0)."
+msgstr ""
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to study how the program works, and adapt it to your needs "
 "(freedom 1).  Access to the source code is a precondition for this."
 msgstr ""
-"La libertad de estudiar el funcionamiento del programa, y adaptarlo a sus "
-"necesidades (libertad 1). El acceso al código fuente es un prerrequisito "
-"para esto."
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to redistribute copies so you can help your neighbor (freedom 2)."
-msgstr "La libertad de distribuir copias para ayudar a los demás (libertad 
2)."
+msgstr ""
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "The freedom to improve the program, and release your improvements to the "
 "public, so that the whole community benefits (freedom 3).  Access to the "
 "source code is a precondition for this."
 msgstr ""
-"La libertad de mejorar el programa y de publicar las mejoras, de modo que "
-"toda la comunidad se beneficie (libertad 3). El acceso al código fuente es "
-"un prerrequisito para esto."
 
-# type: Content of: <table><tr><td><h3>
 #. type: Content of: <div><div><h2>
 msgid "Take Action"
-msgstr "Tome partido"
+msgstr ""
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<strong><a href=\"http://www.fsf.org/campaigns\";>Support current FSF "
 "campaigns</a></strong>."
 msgstr ""
-"<a href=\"http://www.fsf.org/campaigns\";>Apoye las campañas en curso de la "
-"FSF</a>."
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -311,13 +246,7 @@
 "a> and <a href=\"http://www.laquadrature.net/en/\";> other abusive internet "
 "laws </a></strong>."
 msgstr ""
-"<strong>Únase a las protestas en contra de <a 
href=\"http://www.laquadrature.";
-"net/wiki/How_to_act_against_ACTA\">ACTA</a>, de la directiva Europea contra "
-"el compartir <a href=\"http://www.laquadrature.net/en/anti-sharing-directive-";
-"ipred\">IPRED</a> y <a href=\"http://www.laquadrature.net/en/\";>otras leyes "
-"abusivas para Internet</a></strong>."
 
-# type: Content of: <div><div><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<strong>Watch and share this movie:</strong> <a href=\"http://";
@@ -325,32 +254,20 @@
 "\"http://www.fsf.org/associate/\";>FSF associate members</a> like <a href="
 "\"http://fsf.org/jfb\";>you</a>."
 msgstr ""
-"<strong>Vea la siguiente película</strong> (en inglés): <a href=\"http://";
-"patentabsurdity.com\">Patent Absurdity</a>, hecha gracias a los <a href="
-"\"http://www.fsf.org/associate/\";>miembros asociados de la FSF</a> como <a "
-"href=\"http://fsf.org/jfb\";>usted</a>."
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<strong>Fight against software patents:</strong> <a href=\"http://www.";
 "endsoftpatents.org\">worldwide</a>, <a href=\"/server/takeaction.html#swpat"
 "\">and Europe</a>."
 msgstr ""
-"<strong>Luche contra las patentes de software:</strong> <a href=\"http://www.";
-"endsoftpatents.org\">en el mundo</a> y <a href=\"/server/takeaction."
-"html#swpat\">en Europa</a>."
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<strong><a href=\"/server/takeaction.html#wipochange\">Call on WIPO</a></"
 "strong> to change its name and mission."
 msgstr ""
-"<strong><a href=\"/server/takeaction.html#wipochange\">Solicite a la OMPI</"
-"a></strong> que cambie su nombre y su misión."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "Support the efforts on net neutrality in Europe, <a href=\"http://www.";
@@ -358,36 +275,27 @@
 "\">in the USA</a> and <a href=\"http://www.neutrality.ca\"; title=\"Net "
 "neutrality in Canada\">in Canada</a>."
 msgstr ""
-"Apoye los esfuerzos para la neutralidad de la red en Europa, <a href="
-"\"http://www.savetheinternet.com\"; title=\"Neutralidad de la red en los "
-"Estados Unidos de América\">en los EE.UU.</a> y <a href=\"http://www.";
-"neutrality.ca\" title=\"Neutralidad en la red en Canadá\">en Canadá</a>."
 
-# type: Content of: <div><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "Students! <a href=\"http://www.aful.org/communiques/univ-offers-me-windows";
 "\"> Claim a refund on your unused Microsoft Windows licences</a>."
 msgstr ""
-"¡Estudiantes! <a href=\"http://www.aful.org/communiques/univ-offers-me-";
-"windows\">Reclamen la devolución del importe de las licencias Microsoft "
-"Windows sin utilizar.</a>"
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"/server/takeaction.html#directory\">Add to the Free Software "
 "Directory</a>."
 msgstr ""
-"<a href=\"/server/takeaction.html#directory\">Contribuya al Directorio de "
-"Software Libre</a>."
 
-# type: Content of: <table><tr><td><p>
 #. type: Content of: <div><div><ul><li>
+# | <a [-href=\"/education/edu-team.html\">The Education Team</a>-]
+# | {+href=\"/server/takeaction.html\">More action items.</a>+}
+#, fuzzy
+#| msgid "<a href=\"/education/edu-team.html\">The Education Team</a>"
 msgid "<a href=\"/server/takeaction.html\">More action items.</a>"
-msgstr "<a href=\"/server/takeaction.html\">Más acciones</a>."
+msgstr "<a href=\"/education/edu-team.html\">Nuestro equipo</a>"
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
 "<strong>Can you contribute to any of these <a href=\"http://www.fsf.org/";
@@ -397,54 +305,8 @@
 "drivers, and also free software replacements for Skype, OpenDWG libraries, "
 "and Oracle Forms."
 msgstr ""
-"¿<strong>Puede colaborar con alguno de estos  <a href=\"http://www.fsf.org/";
-"campaigns/priority-projects/\">proyectos prioritarios</a>?</strong> Gnash,"
-"coreboot, distribuciones libres de GNU/Linux, GNU Octave, controladores para "
-"routers de red y depuración reversible en GDB, transcripción automática, "
-"drivers para PowerVR. También recambios de software para para Skype, "
-"bibliotecas OpenDWG y Oracle Forms."
 
-# type: Content of: <table><tr><td><ul><li>
 #. type: Content of: <div><p>
-<<<<<<< home.es.po
-# | <strong>Can you take over an <a
-# | href=\"/server/takeaction.html#unmaint\">unmaintained GNU
-# | package</a>?</strong> <a href=\"/software/alive/\">alive</a>, <a
-# | href=\"/software/dotgnu-forum/\">dotgnu-forum</a>, <a
-# | href=\"/software/dr-geo/\">dr-geo</a>, <a
-# | href=\"/software/gnatsweb/\">gnatsweb</a>, <a
-# | [-href=\"/software/gnu-queue/\">gnu-queue</a>, <a
-# | href=\"/software/goldwater/\">goldwater</a>, <a-]
-# | href=\"/software/halifax/\">halifax</a>, <a
-# | href=\"/software/metahtml/\">metahtml</a>, <a
-# | href=\"/software/orgadoc/\">orgadoc</a>, <a
-# | href=\"/software/pgccfd/\">pgccfd</a>, <a
-# | href=\"/software/polyxmass/\">polyxmass</a>, <a
-# | href=\"/software/quickthreads/\">quickthreads</a>, {+<a
-# | href=\"/software/rottlog/\">rottlog</a>,+} <a
-# | href=\"/software/snakecharmer/\">snakecharmer</a>, <a
-# | href=\"/software/thales/\">thales</a> are all <a
-# | href=\"/server/takeaction.html#unmaint\">looking for maintainers</a>.  We
-# | also need <a href=\"/server/takeaction.html#python_configure\">GNU
-# | configure for Python packages</a>.
-#, fuzzy
-#| msgid ""
-#| "<strong>Can you take over an <a href=\"/server/takeaction.html#unmaint"
-#| "\">unmaintained GNU package</a>?</strong> <a href=\"/software/alive/"
-#| "\">alive</a>, <a href=\"/software/dotgnu-forum/\">dotgnu-forum</a>, <a "
-#| "href=\"/software/dr-geo/\">dr-geo</a>, <a href=\"/software/gnatsweb/"
-#| "\">gnatsweb</a>, <a href=\"/software/gnu-queue/\">gnu-queue</a>, <a href="
-#| "\"/software/goldwater/\">goldwater</a>, <a href=\"/software/halifax/"
-#| "\">halifax</a>, <a href=\"/software/metahtml/\">metahtml</a>, <a href=\"/"
-#| "software/orgadoc/\">orgadoc</a>, <a href=\"/software/pgccfd/\">pgccfd</"
-#| "a>, <a href=\"/software/polyxmass/\">polyxmass</a>, <a href=\"/software/"
-#| "quickthreads/\">quickthreads</a>, <a href=\"/software/snakecharmer/"
-#| "\">snakecharmer</a>, <a href=\"/software/thales/\">thales</a> are all <a "
-#| "href=\"/server/takeaction.html#unmaint\">looking for maintainers</a>.  We "
-#| "also need <a href=\"/server/takeaction.html#python_configure\">GNU "
-#| "configure for Python packages</a>."
-=======
->>>>>>> 1.245
 msgid ""
 "<strong>Can you take over an <a href=\"/server/takeaction.html#unmaint"
 "\">unmaintained GNU package</a>?</strong> <a href=\"/software/alive/"
@@ -460,49 +322,25 @@
 "also need <a href=\"/server/takeaction.html#python_configure\">GNU configure "
 "for Python packages</a>."
 msgstr ""
-"<strong>¿Puede ayudar encargándose de uno de estos <a href=\"/server/"
-"takeaction.html#unmaint\">paquetes de GNU sin mantenimiento</a>?</strong> <a "
-"href=\"/software/alive/\">alive</a>, <a href=\"/software/dotgnu-forum/"
-"\">dotgnu-forum</a>, <a href=\"/software/dr-geo/\">dr-geo</a>, <a href=\"/"
-"software/gnatsweb/\">gnatsweb</a>, <a href=\"/software/halifax/\">halifax</"
-"a>, <a href=\"/software/metahtml/\">metahtml</a>, <a href=\"/software/"
-"orgadoc/\">orgadoc</a>, <a href=\"/software/pgccfd/\">pgccfd</a>, <a href=\"/"
-"software/polyxmass/\">polyxmass</a>, <a href=\"/software/quickthreads/"
-"\">quickthreads</a>, <a href=\"/software/rottlog/\">rottlog</a>, <a href=\"/"
-"software/snakecharmer/\">snakecharmer</a>, <a href=\"/software/thales/"
-"\">thales</a>. Para todos ellos <a href=\"/server/takeaction.html#unmaint"
-"\">estamos buscando encargados de mantenimiento</a>.  También necesitamos <a 
"
-"href=\"/server/takeaction.html#python_configure\">GNU configure para "
-"paquetes Python</a>."
 
-# type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
-msgstr " "
+msgstr ""
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007, 2008, 2009, 2010, 2011, 2012 <a href=\"http://www.fsf.org\";>Free "
 "Software Foundation</a>, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
-"2006, 2007, 2008, 2009, 2010 , 2011, 2012 <a href=\"http://www.fsf.org";
-"\">Free Software Foundation</a>, Inc."
 
-# type: Content of: <table><tr><td><p>
 #. type: Content of: <div><p>
 msgid ""
 "The <a href=\"http://www.fsf.org/\";>FSF</a> also has sister organizations in "
 "<a href=\"http://www.fsfe.org\";>Europe</a>, <a href=\"http://www.fsfla.org/";
 "\">Latin America</a> and <a href=\"http://fsf.org.in/\";>India</a>."
 msgstr ""
-"La <a href=\"http://www.fsf.org/\";>FSF</a> también tiene organizaciones "
-"hermanas en <a href=\"http://www.fsfe.org\";>Europa</a>, <a href=\"http://www.";
-"fsfla.org/\">América Latina</a> y en la <a href=\"http://fsf.org.in/";
-"\">India</a>."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -514,30 +352,13 @@
 "org/licenses/by-nd/3.0/us/deed.es\">licencia Creative Commons Atribución-"
 "SinDerivadas 3.0 Estados Unidos de América</a>."
 
-# type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
-"<strong>Traducción: Emilio Silva, 2004.</strong> Revisiones: Miguel Vázquez 
"
-"Gocobachi, Xavier Reina, Dora Scilipoti."
 
 # type: Content of: <div><p>
 #.  timestamp start 
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización: "
-
-#~ msgid ""
-#~ "<a href=\"http://falkvinge.net/2012/06/24/our-final-push-acta-vote-in-ten-";
-#~ "days/\">Kill ACTA Once And For All</a>"
-#~ msgstr ""
-#~ "<a href=\"http://falkvinge.net/2012/06/24/our-final-push-acta-vote-in-ten-";
-#~ "days/\">Elimine ACTA de una vez para siempre</a>"
-
-#~ msgid ""
-#~ "<a href=\"http://www.fsf.org/blogs/community/stop-the-online-spying-bill";
-#~ "\">Stop the Online Spying Bill </a>"
-#~ msgstr ""
-#~ "<a href=\"http://www.fsf.org/blogs/community/stop-the-online-spying-bill";
-#~ "\">Rechace la ley de vigilancia online</a>"



reply via email to

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