# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1306150509 -7200
# Node ID 5457a0984ca18734f4ae8117e9b5cf0f9f3ac762
# Parent  777c47312bc7bffbbbef4df2e50e88371d2285d3# Parent  9b9905be9c1525d126e83451a6e0b6c741436608
backport stable

diff -r 777c47312bc7 -r 5457a0984ca1 .hgtags
--- a/.hgtags	Fri May 20 19:27:00 2011 +0200
+++ b/.hgtags	Mon May 23 13:35:09 2011 +0200
@@ -200,3 +200,5 @@
 ba8fe4f2e408c3fdf6c297cd42c2577dcac50e71 cubicweb-debian-version-3.12.3-1
 5cd0dbc26882f60e3f11ec55e7f058d94505e7ed cubicweb-version-3.12.4
 7c4d34a5ec57f927a70cbc7af7fa8310c847ac42 cubicweb-debian-version-3.12.4-1
+ae33197db1f08d42c9df49563f7b15246f8c8e58 cubicweb-version-3.12.5
+6dfe78a0797ccc34962510f8c2a57f63d65ce41e cubicweb-debian-version-3.12.5-1
diff -r 777c47312bc7 -r 5457a0984ca1 __pkginfo__.py
--- a/__pkginfo__.py	Fri May 20 19:27:00 2011 +0200
+++ b/__pkginfo__.py	Mon May 23 13:35:09 2011 +0200
@@ -22,7 +22,7 @@
 
 modname = distname = "cubicweb"
 
-numversion = (3, 12, 4)
+numversion = (3, 12, 5)
 version = '.'.join(str(num) for num in numversion)
 
 description = "a repository of entities / relations for knowledge management"
diff -r 777c47312bc7 -r 5457a0984ca1 debian/changelog
--- a/debian/changelog	Fri May 20 19:27:00 2011 +0200
+++ b/debian/changelog	Mon May 23 13:35:09 2011 +0200
@@ -1,3 +1,9 @@
+cubicweb (3.12.5-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Mon, 23 May 2011 10:27:42 +0200
+
 cubicweb (3.12.4-1) unstable; urgency=low
 
   * new upstream release
diff -r 777c47312bc7 -r 5457a0984ca1 i18n/de.po
--- a/i18n/de.po	Fri May 20 19:27:00 2011 +0200
+++ b/i18n/de.po	Mon May 23 13:35:09 2011 +0200
@@ -3473,7 +3473,7 @@
 
 #, python-format
 msgid ""
-"relation %s is supported but none if its definitions matches supported "
+"relation %s is supported but none of its definitions matches supported "
 "entities"
 msgstr ""
 
diff -r 777c47312bc7 -r 5457a0984ca1 i18n/en.po
--- a/i18n/en.po	Fri May 20 19:27:00 2011 +0200
+++ b/i18n/en.po	Mon May 23 13:35:09 2011 +0200
@@ -3383,7 +3383,7 @@
 
 #, python-format
 msgid ""
-"relation %s is supported but none if its definitions matches supported "
+"relation %s is supported but none of its definitions matches supported "
 "entities"
 msgstr ""
 
diff -r 777c47312bc7 -r 5457a0984ca1 i18n/es.po
--- a/i18n/es.po	Fri May 20 19:27:00 2011 +0200
+++ b/i18n/es.po	Mon May 23 13:35:09 2011 +0200
@@ -3520,7 +3520,7 @@
 
 #, python-format
 msgid ""
-"relation %s is supported but none if its definitions matches supported "
+"relation %s is supported but none of its definitions matches supported "
 "entities"
 msgstr ""
 "la relación %s es aceptada pero ninguna de sus definiciones corresponden a "
diff -r 777c47312bc7 -r 5457a0984ca1 i18n/fr.po
--- a/i18n/fr.po	Fri May 20 19:27:00 2011 +0200
+++ b/i18n/fr.po	Mon May 23 13:35:09 2011 +0200
@@ -3520,7 +3520,7 @@
 
 #, python-format
 msgid ""
-"relation %s is supported but none if its definitions matches supported "
+"relation %s is supported but none of its definitions matches supported "
 "entities"
 msgstr ""
 "la relation %s est supportée mais aucune de ses définitions ne correspondent "