www people/po/people.es.po philosophy/po/greve-...

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       12/02/01 13:43:47

Modified files:
        people/po      : people.es.po 
        philosophy/po  : greve-clown.fr.po 

Log message:
        Validation fix.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/people.es.po?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/greve-clown.fr.po?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: people/po/people.es.po
===================================================================
RCS file: /web/www/www/people/po/people.es.po,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- people/po/people.es.po      31 Jan 2012 17:46:21 -0000      1.72
+++ people/po/people.es.po      1 Feb 2012 13:43:27 -0000       1.73
@@ -4303,7 +4303,7 @@
 "Por favor, envíe sus comentarios y preguntas sobre la <acronym title=\"Free "
 "Software Foundation\">FSF</acronym> y el proyecto GNU a <a href=\"mailto:";
 "g...@gnu.org\">&lt;g...@gnu.org&gt;</a>. También existen <a href=\"/contact/"
-"\">otros medios para contactar</a> con la FSF</a>."
+"\">otros medios para contactar</a> con la FSF."
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>

Index: philosophy/po/greve-clown.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/greve-clown.fr.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/greve-clown.fr.po     31 Jan 2012 18:02:34 -0000      1.14
+++ philosophy/po/greve-clown.fr.po     1 Feb 2012 13:43:39 -0000       1.15
@@ -56,14 +56,6 @@
 msgstr "</small>"
 
 #. type: Content of: <h3>
-<<<<<<< greve-clown.fr.po
-# || No change detected.  The change might only be in amounts of spaces.
-#, fuzzy
-#| msgid ""
-#| "<a href=\"http://gnu.org\";>Georg C. F. Greve</a> <a href=\"mailto:";
-#| "gr...@gnu.org\">&lt;gr...@gnu.org&gt;</a>"
-=======
->>>>>>> 1.13
 msgid ""
 "<a href=\"http://gnu.org\";>Georg C. F. Greve</a> <a href=\"mailto:greve@gnu.";
 "org\">&lt;gr...@gnu.org&gt;</a>"