# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1324572415 -3600
# Node ID 9dc024fea040b42ad13f300a4b620b4e6574153e
# Parent  f9ebb6d1abc3bc45967aa784d9a6abfa0e1171cb# Parent  c33092c4086f7cd3bc5780120f32528a8063ce6a
backport stable

diff -r f9ebb6d1abc3 -r 9dc024fea040 .hgtags
--- a/.hgtags	Wed Dec 21 18:26:35 2011 +0100
+++ b/.hgtags	Thu Dec 22 17:46:55 2011 +0100
@@ -239,3 +239,5 @@
 2eab9a5a6bf8e3b0cf706bee8cdf697759c0a33a cubicweb-debian-version-3.13.10-1
 793d2d327b3ebf0b82b2735cf3ccb86467d1c08a cubicweb-version-3.14.1
 6928210da4fc25d086b5b8d5ff2029da41aade2e cubicweb-debian-version-3.14.1-1
+049a3819f03dc79d803be054cc3bfe8425313f63 cubicweb-version-3.14.2
+17ebd836cee30a9f690e83af7ce98287a7216d57 cubicweb-debian-version-3.14.2-1
diff -r f9ebb6d1abc3 -r 9dc024fea040 __pkginfo__.py
--- a/__pkginfo__.py	Wed Dec 21 18:26:35 2011 +0100
+++ b/__pkginfo__.py	Thu Dec 22 17:46:55 2011 +0100
@@ -22,7 +22,7 @@
 
 modname = distname = "cubicweb"
 
-numversion = (3, 14, 1)
+numversion = (3, 14, 2)
 version = '.'.join(str(num) for num in numversion)
 
 description = "a repository of entities / relations for knowledge management"
diff -r f9ebb6d1abc3 -r 9dc024fea040 debian/changelog
--- a/debian/changelog	Wed Dec 21 18:26:35 2011 +0100
+++ b/debian/changelog	Thu Dec 22 17:46:55 2011 +0100
@@ -1,3 +1,9 @@
+cubicweb (3.14.2-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Thu, 22 Dec 2011 15:09:09 +0100
+
 cubicweb (3.14.1-1) unstable; urgency=low
 
   * new upstream release
diff -r f9ebb6d1abc3 -r 9dc024fea040 i18n/fr.po
--- a/i18n/fr.po	Wed Dec 21 18:26:35 2011 +0100
+++ b/i18n/fr.po	Thu Dec 22 17:46:55 2011 +0100
@@ -983,7 +983,7 @@
 msgstr "classe de base abstraite pour les transitions"
 
 msgid "action menu"
-msgstr ""
+msgstr "actions"
 
 msgid "action(s) on this selection"
 msgstr "action(s) sur cette sélection"