equal
deleted
inserted
replaced
2 # Copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved. |
2 # Copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved. |
3 # Logilab <contact@logilab.fr> |
3 # Logilab <contact@logilab.fr> |
4 msgid "" |
4 msgid "" |
5 msgstr "" |
5 msgstr "" |
6 "Project-Id-Version: cubicweb 2.46.0\n" |
6 "Project-Id-Version: cubicweb 2.46.0\n" |
7 "PO-Revision-Date: 2011-04-29 12:57+0200\n" |
7 "PO-Revision-Date: 2011-06-23 10:23+0200\n" |
8 "Last-Translator: Logilab Team <contact@logilab.fr>\n" |
8 "Last-Translator: Logilab Team <contact@logilab.fr>\n" |
9 "Language-Team: fr <contact@logilab.fr>\n" |
9 "Language-Team: fr <contact@logilab.fr>\n" |
10 "Language: \n" |
10 "Language: \n" |
11 "MIME-Version: 1.0\n" |
11 "MIME-Version: 1.0\n" |
12 "Content-Type: text/plain; charset=UTF-8\n" |
12 "Content-Type: text/plain; charset=UTF-8\n" |
4102 |
4102 |
4103 msgctxt "TrInfo" |
4103 msgctxt "TrInfo" |
4104 msgid "tr_count" |
4104 msgid "tr_count" |
4105 msgstr "n° de transition" |
4105 msgstr "n° de transition" |
4106 |
4106 |
|
4107 <<<<<<< /home/syt/src/fcubicweb/cubicweb/i18n/fr.po |
4107 msgid "transaction undoed" |
4108 msgid "transaction undoed" |
4108 msgstr "transaction annulée" |
4109 msgstr "transaction annulée" |
|
4110 ======= |
|
4111 msgid "transaction undone" |
|
4112 msgstr "transaction annulée" |
|
4113 >>>>>>> /tmp/fr.po~other.p9Lq3c |
4109 |
4114 |
4110 #, python-format |
4115 #, python-format |
4111 msgid "transition %(tr)s isn't allowed from %(st)s" |
4116 msgid "transition %(tr)s isn't allowed from %(st)s" |
4112 msgstr "la transition %(tr)s n'est pas autorisée depuis l'état %(st)s" |
4117 msgstr "la transition %(tr)s n'est pas autorisée depuis l'état %(st)s" |
4113 |
4118 |