Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[i18n] fix undetected conflict
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 30 Jun 2011 13:38:30 +0200
changeset 7588 7588240bcb36
parent 7586 b3688b15d7f5
child 7590 a9aad6c25836
[i18n] fix undetected conflict
i18n/fr.po file | annotate | diff | comparison | revisions
web/views/navigation.py file | annotate | diff | comparison | revisions 
--- a/i18n/fr.po	Wed Jun 29 20:57:28 2011 +0200
+++ b/i18n/fr.po	Thu Jun 30 13:38:30 2011 +0200
@@ -4104,13 +4104,8 @@
 msgid "tr_count"
 msgstr "n° de transition"
 
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/i18n/fr.po
-msgid "transaction undoed"
-msgstr "transaction annulée"
-=======
 msgid "transaction undone"
 msgstr "transaction annulée"
->>>>>>> /tmp/fr.po~other.p9Lq3c
 
 #, python-format
 msgid "transition %(tr)s isn't allowed from %(st)s"
--- a/web/views/navigation.py	Wed Jun 29 20:57:28 2011 +0200
+++ b/web/views/navigation.py	Thu Jun 30 13:38:30 2011 +0200
@@ -1,4 +1,4 @@
-# copyright 2003-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 # contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
 #
 # This file is part of CubicWeb.
cubicweb