www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www home.fr.html po/home-staged.fr.po po/home.f...

From: GNUN
Subject: www home.fr.html po/home-staged.fr.po po/home.f...
Date: Mon, 27 Feb 2012 00:01:32 +0000 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/02/27 00:01:32

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

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.fr.html?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home-staged.fr.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.fr.po?cvsroot=www&r1=1.208&r2=1.209

Patches:
Index: home.fr.html
===================================================================
RCS file: /web/www/www/home.fr.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- home.fr.html        24 Feb 2012 21:06:14 -0000      1.73
+++ home.fr.html        27 Feb 2012 00:00:59 -0000      1.74
@@ -285,7 +285,7 @@
  <p><!-- timestamp start -->
 Dernière mise à jour&nbsp;:
 
-$Date: 2012/02/24 21:06:14 $
+$Date: 2012/02/27 00:00:59 $
 
 <!-- timestamp end -->
 </p>

Index: po/home-staged.fr.po
===================================================================
RCS file: /web/www/www/po/home-staged.fr.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/home-staged.fr.po        26 Feb 2012 23:00:26 -0000      1.29
+++ po/home-staged.fr.po        27 Feb 2012 00:01:12 -0000      1.30
@@ -9,14 +9,20 @@
 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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-24 16:05-0500\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
@@ -278,6 +284,14 @@
 
 #. 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</"
@@ -289,6 +303,7 @@
 "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 ""
@@ -333,6 +348,10 @@
 "title=\"Net neutrality in Canada\">au Canada</a>."
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Students! <a href=\"http://www.aful.org/communiques/univ-offers-me-windows";
+#| "\">Claim a refund on your unused Microsoft Windows licences</a>."
 msgid ""
 "Students! <a href=\"http://www.aful.org/communiques/univ-offers-me-windows";
 "\"> Claim a refund on your unused Microsoft Windows licences</a>."
@@ -449,3 +468,23 @@
 #. 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

Index: po/home.fr.po
===================================================================
RCS file: /web/www/www/po/home.fr.po,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- po/home.fr.po       26 Feb 2012 23:00:23 -0000      1.208
+++ po/home.fr.po       27 Feb 2012 00:01:12 -0000      1.209
@@ -9,14 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: home.html\n"
+<<<<<<< home.fr.po
+"POT-Creation-Date: 2012-02-24 16:04-0500\n"
+"PO-Revision-Date: 2012-02-24 19:56+0100\n"
+=======
 "POT-Creation-Date: 2012-02-24 16:04-0500\n"
 "PO-Revision-Date: 2012-02-27 00:03+0100\n"
+>>>>>>> 1.208
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-24 16:04-0500\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
@@ -278,6 +284,14 @@
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
+<<<<<<< home.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</"
@@ -289,6 +303,7 @@
 "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.208
 
 #. type: Content of: <div><div><ul><li>
 msgid ""
@@ -333,6 +348,10 @@
 "title=\"Net neutrality in Canada\">au Canada</a>."
 
 #. type: Content of: <div><div><ul><li>
+#, fuzzy
+#| msgid ""
+#| "Students! <a href=\"http://www.aful.org/communiques/univ-offers-me-windows";
+#| "\">Claim a refund on your unused Microsoft Windows licences</a>."
 msgid ""
 "Students! <a href=\"http://www.aful.org/communiques/univ-offers-me-windows";
 "\"> Claim a refund on your unused Microsoft Windows licences</a>."
@@ -449,3 +468,23 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour&nbsp;:"
+<<<<<<< home.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.208
reply via email to
[Prev in Thread] Current Thread [Next in Thread]