--- a/cwconfig.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/cwconfig.py	Fri Sep 11 18:05:38 2015 +0200
@@ -167,7 +167,6 @@
 from __future__ import print_function
 
 __docformat__ = "restructuredtext en"
-_ = unicode
 
 import sys
 import os
@@ -189,7 +188,7 @@
                                           ConfigurationMixIn, merge_options)
 
 from cubicweb import (CW_SOFTWARE_ROOT, CW_MIGRATION_MAP,
-                      ConfigurationError, Binary)
+                      ConfigurationError, Binary, _)
 from cubicweb.toolsutils import create_dir
 
 CONFIGURATIONS = []

--- a/cwvreg.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/cwvreg.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 import sys
 from os.path import join, dirname, realpath

--- a/entities/adapters.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/entities/adapters.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from itertools import chain
 from warnings import warn

--- a/hooks/integrity.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/hooks/integrity.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from threading import Lock
 

--- a/hooks/synccomputed.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/hooks/synccomputed.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Hooks for synchronizing computed attributes"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from collections import defaultdict
 

--- a/hooks/syncschema.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/hooks/syncschema.py	Fri Sep 11 18:05:38 2015 +0200
@@ -24,7 +24,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from copy import copy
 from hashlib import md5

--- a/hooks/syncsession.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/hooks/syncsession.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Core hooks: synchronize living session on persistent data changes"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from cubicweb import UnknownProperty, BadConnectionId, validation_error
 from cubicweb.predicates import is_instance

--- a/hooks/syncsources.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/hooks/syncsources.py	Fri Sep 11 18:05:38 2015 +0200
@@ -17,7 +17,7 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """hooks for repository sources synchronization"""
 
-_ = unicode
+from cubicweb import _
 
 from socket import gethostname
 

--- a/hooks/test/data/schema.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/hooks/test/data/schema.py	Fri Sep 11 18:05:38 2015 +0200
@@ -22,7 +22,7 @@
 
 from cubicweb.schema import ERQLExpression
 
-_ = unicode
+from cubicweb import _
 
 class friend(RelationDefinition):
     subject = ('CWUser', 'CWGroup')

--- a/hooks/workflow.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/hooks/workflow.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Core hooks: workflow related hooks"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from datetime import datetime
 

--- a/schema.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/schema.py	Fri Sep 11 18:05:38 2015 +0200
@@ -19,7 +19,6 @@
 from __future__ import print_function
 
 __docformat__ = "restructuredtext en"
-_ = unicode
 
 import re
 from os.path import join, basename
@@ -49,7 +48,7 @@
 from rql.analyze import ETypeResolver
 
 import cubicweb
-from cubicweb import ETYPE_NAME_MAP, ValidationError, Unauthorized
+from cubicweb import ETYPE_NAME_MAP, ValidationError, Unauthorized, _
 
 try:
     from cubicweb import server

--- a/schemas/Bookmark.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/schemas/Bookmark.py	Fri Sep 11 18:05:38 2015 +0200
@@ -19,7 +19,7 @@
 
 """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from yams.buildobjs import EntityType, RelationType, SubjectRelation, String
 from cubicweb.schema import RRQLExpression

--- a/schemas/base.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/schemas/base.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """core CubicWeb schema, but not necessary at bootstrap time"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from yams.buildobjs import (EntityType, RelationType, RelationDefinition,
                             SubjectRelation,

--- a/schemas/bootstrap.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/schemas/bootstrap.py	Fri Sep 11 18:05:38 2015 +0200
@@ -19,7 +19,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from yams.buildobjs import (EntityType, RelationType, RelationDefinition, Bytes,
                             SubjectRelation, RichString, String, Boolean, Int)

--- a/schemas/workflow.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/schemas/workflow.py	Fri Sep 11 18:05:38 2015 +0200
@@ -19,7 +19,7 @@
 
 """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from yams.buildobjs import (EntityType, RelationType, RelationDefinition,
                             SubjectRelation,

--- a/server/sources/ldapfeed.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/server/sources/ldapfeed.py	Fri Sep 11 18:05:38 2015 +0200
@@ -34,7 +34,7 @@
 from cubicweb.server import utils
 from cubicweb.server.sources import datafeed
 
-_ = unicode
+from cubicweb import _
 
 # search scopes
 BASE = ldap.SCOPE_BASE

--- a/server/test/data-migractions/cubes/fakeemail/schema.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/server/test/data-migractions/cubes/fakeemail/schema.py	Fri Sep 11 18:05:38 2015 +0200
@@ -5,7 +5,7 @@
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 # pylint: disable-msg=E0611,F0401
 from yams.buildobjs import (SubjectRelation, RelationType, EntityType,

--- a/sobjects/notification.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/sobjects/notification.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """some views to handle notification on data changes"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from itertools import repeat
 

--- a/sobjects/supervising.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/sobjects/supervising.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """some hooks and views to handle supervising of any data changes"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from cubicweb import UnknownEid
 from cubicweb.predicates import none_rset

--- a/test/data/schema.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/test/data/schema.py	Fri Sep 11 18:05:38 2015 +0200
@@ -23,7 +23,7 @@
                              RQLConstraint, RQLVocabularyConstraint)
 
 
-_ = unicode
+from cubicweb import _
 
 
 class Personne(EntityType):

--- a/transaction.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/transaction.py	Fri Sep 11 18:05:38 2015 +0200
@@ -17,7 +17,7 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 """ undoable transaction objects. """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from cubicweb import RepositoryError
 

--- a/view.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/view.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """abstract views and templates classes for CubicWeb web client"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from io import BytesIO
 from warnings import warn

--- a/web/__init__.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/__init__.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves.urllib.parse import quote as urlquote
 from logilab.common.deprecation import deprecated

--- a/web/action.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/action.py	Fri Sep 11 18:05:38 2015 +0200
@@ -33,7 +33,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from cubicweb import target
 from cubicweb.predicates import (partial_relation_possible, match_search_state,

--- a/web/box.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/box.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """abstract box classes for CubicWeb web client"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from logilab.mtconverter import xml_escape
 from logilab.common.deprecation import class_deprecated, class_renamed

--- a/web/component.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/component.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/facet.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/facet.py	Fri Sep 11 18:05:38 2015 +0200
@@ -50,7 +50,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from functools import reduce
 from warnings import warn

--- a/web/schemaviewer.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/schemaviewer.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """an helper class to display CubicWeb schema using ureports"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six import string_types
 

--- a/web/views/actions.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/actions.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Set of HTML base actions"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/autoform.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/autoform.py	Fri Sep 11 18:05:38 2015 +0200
@@ -119,7 +119,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/basecomponents.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/basecomponents.py	Fri Sep 11 18:05:38 2015 +0200
@@ -21,7 +21,7 @@
 * the logged user link
 """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from logilab.mtconverter import xml_escape
 from logilab.common.registry import yes

--- a/web/views/basecontrollers.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/basecontrollers.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/basetemplates.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/basetemplates.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """default templates for CubicWeb web client"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from logilab.mtconverter import xml_escape
 from logilab.common.deprecation import class_renamed

--- a/web/views/baseviews.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/baseviews.py	Fri Sep 11 18:05:38 2015 +0200
@@ -76,7 +76,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from datetime import timedelta
 from warnings import warn

--- a/web/views/bookmark.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/bookmark.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Primary view for bookmarks + user's bookmarks box"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from logilab.mtconverter import xml_escape
 

--- a/web/views/boxes.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/boxes.py	Fri Sep 11 18:05:38 2015 +0200
@@ -26,7 +26,7 @@
 * startup views box
 """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/calendar.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/calendar.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """html calendar views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 import copy
 from datetime import timedelta

--- a/web/views/csvexport.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/csvexport.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """csv export views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/cwproperties.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/cwproperties.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Specific views for CWProperty (eg site/user preferences"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from logilab.mtconverter import xml_escape
 

--- a/web/views/cwsources.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/cwsources.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 import logging
 from itertools import repeat

--- a/web/views/cwuser.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/cwuser.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Specific views for users and groups"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from hashlib import sha1 # pylint: disable=E0611
 

--- a/web/views/debug.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/debug.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """management and error screens"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from time import strftime, localtime
 

--- a/web/views/dotgraphview.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/dotgraphview.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """some basic stuff to build dot generated graph images"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 import tempfile
 import os

--- a/web/views/editforms.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/editforms.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from copy import copy
 

--- a/web/views/editviews.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/editviews.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Some views used to help to the edition process"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from logilab.common.decorators import cached
 from logilab.mtconverter import xml_escape

--- a/web/views/facets.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/facets.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """the facets box and some basic facets"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/formrenderers.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/formrenderers.py	Fri Sep 11 18:05:38 2015 +0200
@@ -33,7 +33,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/ibreadcrumbs.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/ibreadcrumbs.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """breadcrumbs components definition for CubicWeb web client"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/idownloadable.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/idownloadable.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 =====================================================
 """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/json.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/json.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """json export views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from cubicweb.uilib import rest_traceback
 

--- a/web/views/management.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/management.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """security management and error screens"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 
 from logilab.mtconverter import xml_escape

--- a/web/views/navigation.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/navigation.py	Fri Sep 11 18:05:38 2015 +0200
@@ -46,7 +46,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from datetime import datetime
 

--- a/web/views/owl.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/owl.py	Fri Sep 11 18:05:38 2015 +0200
@@ -19,7 +19,7 @@
 
 """
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/plots.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/plots.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """basic plot views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/primary.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/primary.py	Fri Sep 11 18:05:38 2015 +0200
@@ -38,7 +38,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/rdf.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/rdf.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """base xml and rss views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/reledit.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/reledit.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 import copy
 from warnings import warn

--- a/web/views/schema.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/schema.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """Specific views for schema related entities"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from itertools import cycle
 

--- a/web/views/sparql.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/sparql.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """SPARQL integration"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/startup.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/startup.py	Fri Sep 11 18:05:38 2015 +0200
@@ -22,7 +22,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from logilab.common.textutils import unormalize
 from logilab.common.deprecation import deprecated

--- a/web/views/tableview.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/tableview.py	Fri Sep 11 18:05:38 2015 +0200
@@ -61,7 +61,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 from copy import copy

--- a/web/views/tabs.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/tabs.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """base classes to handle tabbed views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six import string_types
 

--- a/web/views/timetable.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/timetable.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """html timetable views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/treeview.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/treeview.py	Fri Sep 11 18:05:38 2015 +0200
@@ -20,7 +20,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from warnings import warn
 

--- a/web/views/undohistory.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/undohistory.py	Fri Sep 11 18:05:38 2015 +0200
@@ -17,7 +17,7 @@
 # with CubicWeb.  If not, see <http://www.gnu.org/licenses/>.
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 
 from logilab.common.registry import Predicate

--- a/web/views/vcard.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/vcard.py	Fri Sep 11 18:05:38 2015 +0200
@@ -23,7 +23,7 @@
 from cubicweb.predicates import is_instance
 from cubicweb.view import EntityView
 
-_ = unicode
+from cubicweb import _
 
 VCARD_PHONE_TYPES = {'home': 'HOME', 'office': 'WORK', 'mobile': 'CELL', 'fax': 'FAX'}
 

--- a/web/views/wdoc.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/wdoc.py	Fri Sep 11 18:05:38 2015 +0200
@@ -35,7 +35,7 @@
 from cubicweb.view import StartupView
 from cubicweb.uilib import rest_publish
 from cubicweb.web import NotFound, action
-_ = unicode
+from cubicweb import _
 
 # table of content management #################################################
 

--- a/web/views/workflow.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/workflow.py	Fri Sep 11 18:05:38 2015 +0200
@@ -22,7 +22,7 @@
 """
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 import os
 from warnings import warn

--- a/web/views/xbel.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/xbel.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """xbel views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from six.moves import range
 

--- a/web/views/xmlrss.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/views/xmlrss.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """base xml and rss views"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 from base64 import b64encode
 from time import timezone

--- a/web/webconfig.py	Fri Sep 11 18:01:36 2015 +0200
+++ b/web/webconfig.py	Fri Sep 11 18:05:38 2015 +0200
@@ -18,7 +18,7 @@
 """web ui configuration for cubicweb instances"""
 
 __docformat__ = "restructuredtext en"
-_ = unicode
+from cubicweb import _
 
 import os
 import hmac