www/po home-staged.fr.po

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       12/02/27 05:28:06

Modified files:
        po             : home-staged.fr.po 

Log message:
        Fix CVS conflict.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home-staged.fr.po?cvsroot=www&r1=1.30&r2=1.31

Patches:
Index: home-staged.fr.po
===================================================================
RCS file: /web/www/www/po/home-staged.fr.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- home-staged.fr.po   27 Feb 2012 00:01:12 -0000      1.30
+++ home-staged.fr.po   27 Feb 2012 05:28:02 -0000      1.31
@@ -9,13 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: home.html\n"
-<<<<<<< home-staged.fr.po
-"POT-Creation-Date: 2012-02-24 16:05-0500\n"
-"PO-Revision-Date: 2012-02-24 19:55+0100\n"
-=======
 "POT-Creation-Date: 2012-02-24 16:05-0500\n"
 "PO-Revision-Date: 2012-02-27 00:03+0100\n"
->>>>>>> 1.29
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
 "Language: fr\n"
@@ -284,14 +279,6 @@
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
-<<<<<<< home-staged.fr.po
-"<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> and <a href=\"http://www.laquadrature.net/en/\";> other abusive internet "
-"laws </a></strong>."
-msgstr ""
-=======
 "<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</"
@@ -303,7 +290,6 @@
 "européenne anti-partage <a href=\"http://www.laquadrature.net/fr/directive-";
 "anti-partage-ipred\">IPRED</a> et <a href=\"http://www.laquadrature.net/fr/";
 "\">d'autres lois maltraitant Internet</a></strong>."
->>>>>>> 1.29
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -468,23 +454,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
-<<<<<<< home-staged.fr.po
-
-#~ msgid ""
-#~ "<strong><a href=\"http://wiki.stoppacta-protest.info/Main_Page\";>Stop "
-#~ "ACTA, IPRED and other abusive internet laws</a></strong>."
-#~ msgstr ""
-#~ "<strong><a href=\"http://wiki.stoppacta-protest.info/Main_Page\";>Stoppez "
-#~ "ACTA, IPRED et les autres lois maltraitant Internet</a></strong>."
-
-#~ msgid ""
-#~ "<a href=\"http://idealab.talkingpointsmemo.com/2012/01/new-yorks-tech-";
-#~ "scene-will-physically-protest-sopapipa.php\">NYC Tech Scene to Physically "
-#~ "Protest SOPA/PIPA</a>"
-#~ msgstr ""
-#~ "<a href=\"http://idealab.talkingpointsmemo.com/2012/01/new-yorks-tech-";
-#~ "scene-will-physically-protest-sopapipa.php\">La scène technologique new-"
-#~ "yorkaise va manifester physiquement contre les projets de loi SOPA/PIPA</"
-#~ "a> [EN]"
-=======
->>>>>>> 1.29