equal
deleted
inserted
replaced
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 |
|
4108 msgid "transaction undoed" |
|
4109 msgstr "transaction annulée" |
|
4110 ======= |
|
4111 msgid "transaction undone" |
4107 msgid "transaction undone" |
4112 msgstr "transaction annulée" |
4108 msgstr "transaction annulée" |
4113 >>>>>>> /tmp/fr.po~other.p9Lq3c |
|
4114 |
4109 |
4115 #, python-format |
4110 #, python-format |
4116 msgid "transition %(tr)s isn't allowed from %(st)s" |
4111 msgid "transition %(tr)s isn't allowed from %(st)s" |
4117 msgstr "la transition %(tr)s n'est pas autorisée depuis l'état %(st)s" |
4112 msgstr "la transition %(tr)s n'est pas autorisée depuis l'état %(st)s" |
4118 |
4113 |