diff --git a/glance/api/authorization.py b/glance/api/authorization.py
index c5eb4eb7bd..6ae30085b7 100644
--- a/glance/api/authorization.py
+++ b/glance/api/authorization.py
@@ -18,6 +18,9 @@ import copy
 
 from glance.common import exception
 import glance.domain.proxy
+from glance import i18n
+
+_ = i18n._
 
 
 def is_image_mutable(context, image):
diff --git a/glance/api/common.py b/glance/api/common.py
index 42b43a5ee5..faa56b27cc 100644
--- a/glance/api/common.py
+++ b/glance/api/common.py
@@ -24,6 +24,7 @@ from glance import i18n
 from glance.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
diff --git a/glance/api/middleware/context.py b/glance/api/middleware/context.py
index be762dcdb6..22efebf9ca 100644
--- a/glance/api/middleware/context.py
+++ b/glance/api/middleware/context.py
@@ -20,9 +20,11 @@ import webob.exc
 from glance.api import policy
 from glance.common import wsgi
 import glance.context
+from glance import i18n
 from glance.openstack.common import local
 import glance.openstack.common.log as logging
 
+_ = i18n._
 
 context_opts = [
     cfg.BoolOpt('owner_is_tenant', default=True,
diff --git a/glance/api/middleware/version_negotiation.py b/glance/api/middleware/version_negotiation.py
index d9ed8ab584..6f60b43a94 100644
--- a/glance/api/middleware/version_negotiation.py
+++ b/glance/api/middleware/version_negotiation.py
@@ -29,7 +29,7 @@ import glance.openstack.common.log as logging
 CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
-
+_ = i18n._
 _LW = i18n._LW
 
 
diff --git a/glance/api/policy.py b/glance/api/policy.py
index 55efc60ef1..b95e8bb299 100644
--- a/glance/api/policy.py
+++ b/glance/api/policy.py
@@ -29,7 +29,7 @@ import glance.openstack.common.log as logging
 from glance.openstack.common import policy
 
 LOG = logging.getLogger(__name__)
-
+_ = i18n._
 _LI = i18n._LI
 _LW = i18n._LW
 
diff --git a/glance/api/v1/controller.py b/glance/api/v1/controller.py
index 301ed61df2..b497ace598 100644
--- a/glance/api/v1/controller.py
+++ b/glance/api/v1/controller.py
@@ -17,11 +17,13 @@ import glance_store as store
 import webob.exc
 
 from glance.common import exception
+from glance import i18n
 import glance.openstack.common.log as logging
 import glance.registry.client.v1.api as registry
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 
 class BaseController(object):
diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py
index c406639c7f..7b682434a8 100644
--- a/glance/api/v1/images.py
+++ b/glance/api/v1/images.py
@@ -50,6 +50,7 @@ import glance.openstack.common.log as logging
 import glance.registry.client.v1.api as registry
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
diff --git a/glance/api/v1/members.py b/glance/api/v1/members.py
index 4d574e5f6e..2bdc2a796d 100644
--- a/glance/api/v1/members.py
+++ b/glance/api/v1/members.py
@@ -22,10 +22,12 @@ from glance.api.v1 import controller
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
+from glance import i18n
 import glance.openstack.common.log as logging
 import glance.registry.client.v1.api as registry
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 CONF = cfg.CONF
 CONF.import_opt('image_member_quota', 'glance.common.config')
 
diff --git a/glance/api/v1/upload_utils.py b/glance/api/v1/upload_utils.py
index a97796ae0e..e2d37ae159 100644
--- a/glance/api/v1/upload_utils.py
+++ b/glance/api/v1/upload_utils.py
@@ -28,6 +28,7 @@ import glance.registry.client.v1.api as registry
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py
index 49f29294e9..a71243bce0 100644
--- a/glance/api/v2/image_data.py
+++ b/glance/api/v2/image_data.py
@@ -28,6 +28,7 @@ import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 
 
diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py
index acccb162e2..87f1d878b9 100644
--- a/glance/api/v2/images.py
+++ b/glance/api/v2/images.py
@@ -36,6 +36,7 @@ import glance.openstack.common.log as logging
 import glance.schema
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LW = i18n._LW
 
 CONF = cfg.CONF
diff --git a/glance/api/v2/metadef_namespaces.py b/glance/api/v2/metadef_namespaces.py
index 64f06463af..3fdffbefa0 100644
--- a/glance/api/v2/metadef_namespaces.py
+++ b/glance/api/v2/metadef_namespaces.py
@@ -38,6 +38,7 @@ import glance.openstack.common.log as logging
 import glance.schema
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LW = i18n._LW
 _LI = i18n._LI
diff --git a/glance/api/v2/metadef_objects.py b/glance/api/v2/metadef_objects.py
index 139ef6a660..a23fc18b9d 100644
--- a/glance/api/v2/metadef_objects.py
+++ b/glance/api/v2/metadef_objects.py
@@ -34,6 +34,7 @@ import glance.openstack.common.log as logging
 import glance.schema
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 
diff --git a/glance/api/v2/metadef_properties.py b/glance/api/v2/metadef_properties.py
index cfef0ffe18..5e52bf927f 100644
--- a/glance/api/v2/metadef_properties.py
+++ b/glance/api/v2/metadef_properties.py
@@ -34,6 +34,7 @@ import glance.openstack.common.log as logging
 import glance.schema
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 
diff --git a/glance/api/v2/metadef_resource_types.py b/glance/api/v2/metadef_resource_types.py
index 7809db5021..e41b5b35f1 100644
--- a/glance/api/v2/metadef_resource_types.py
+++ b/glance/api/v2/metadef_resource_types.py
@@ -34,6 +34,7 @@ import glance.openstack.common.log as logging
 import glance.schema
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 
diff --git a/glance/api/v2/tasks.py b/glance/api/v2/tasks.py
index 2c5de88772..daa356305b 100644
--- a/glance/api/v2/tasks.py
+++ b/glance/api/v2/tasks.py
@@ -36,6 +36,7 @@ import glance.openstack.common.log as logging
 import glance.schema
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LW = i18n._LW
 
 CONF = cfg.CONF
diff --git a/glance/api/versions.py b/glance/api/versions.py
index dd864a9edd..6fb8613ed8 100644
--- a/glance/api/versions.py
+++ b/glance/api/versions.py
@@ -20,7 +20,9 @@ from oslo.serialization import jsonutils
 import webob.dec
 
 from glance.common import wsgi
+from glance import i18n
 
+_ = i18n._
 
 versions_opts = [
     cfg.StrOpt('public_endpoint', default=None,
diff --git a/glance/cmd/__init__.py b/glance/cmd/__init__.py
index a02646be22..e1aeec3bd1 100644
--- a/glance/cmd/__init__.py
+++ b/glance/cmd/__init__.py
@@ -16,4 +16,3 @@
 from glance import i18n
 
 i18n.enable_lazy()
-i18n.install('glance')
diff --git a/glance/cmd/control.py b/glance/cmd/control.py
index 3527f4542d..22c6ba8af5 100644
--- a/glance/cmd/control.py
+++ b/glance/cmd/control.py
@@ -44,7 +44,9 @@ from oslo.utils import units
 from six.moves import xrange
 
 from glance.common import config
+from glance import i18n
 
+_ = i18n._
 
 CONF = cfg.CONF
 
diff --git a/glance/cmd/replicator.py b/glance/cmd/replicator.py
index 780948ab59..39aa28d94c 100755
--- a/glance/cmd/replicator.py
+++ b/glance/cmd/replicator.py
@@ -33,6 +33,7 @@ from glance import i18n
 from glance.openstack.common import log
 
 LOG = log.getLogger(__name__)
+_ = i18n._
 _LI = i18n._LI
 _LE = i18n._LE
 _LW = i18n._LW
diff --git a/glance/common/auth.py b/glance/common/auth.py
index a01b8fde1d..5010a262c2 100644
--- a/glance/common/auth.py
+++ b/glance/common/auth.py
@@ -33,10 +33,12 @@ from oslo.serialization import jsonutils
 import six.moves.urllib.parse as urlparse
 
 from glance.common import exception
+from glance import i18n
 import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 
 class BaseStrategy(object):
diff --git a/glance/common/client.py b/glance/common/client.py
index b6573f8978..06fa35e048 100644
--- a/glance/common/client.py
+++ b/glance/common/client.py
@@ -48,9 +48,11 @@ from six.moves import xrange
 from glance.common import auth
 from glance.common import exception
 from glance.common import utils
+from glance import i18n
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 # common chunk size for get and put
 CHUNKSIZE = 65536
diff --git a/glance/common/config.py b/glance/common/config.py
index fc531936b0..8cea7c417a 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -27,8 +27,11 @@ import os
 from oslo.config import cfg
 from paste import deploy
 
+from glance import i18n
 from glance.version import version_info as version
 
+_ = i18n._
+
 paste_deploy_opts = [
     cfg.StrOpt('flavor',
                help=_('Partial name of a pipeline in your paste configuration '
diff --git a/glance/common/exception.py b/glance/common/exception.py
index 508517bc6d..cb45a24775 100644
--- a/glance/common/exception.py
+++ b/glance/common/exception.py
@@ -19,6 +19,10 @@
 import six
 import six.moves.urllib.parse as urlparse
 
+from glance import i18n
+
+_ = i18n._
+
 _FATAL_EXCEPTION_FORMAT_ERRORS = False
 
 
diff --git a/glance/common/location_strategy/__init__.py b/glance/common/location_strategy/__init__.py
index 45f90115ac..e2f3fcbfd9 100644
--- a/glance/common/location_strategy/__init__.py
+++ b/glance/common/location_strategy/__init__.py
@@ -18,8 +18,11 @@ import copy
 from oslo.config import cfg
 import stevedore
 
+from glance import i18n
 import glance.openstack.common.log as logging
 
+_ = i18n._
+
 location_strategy_opts = [
     cfg.StrOpt('location_strategy', default='location_order',
                help=_("This value sets what strategy will be used to "
diff --git a/glance/common/location_strategy/store_type.py b/glance/common/location_strategy/store_type.py
index aededb5484..75f8c23967 100644
--- a/glance/common/location_strategy/store_type.py
+++ b/glance/common/location_strategy/store_type.py
@@ -19,6 +19,10 @@ from oslo.config import cfg
 import six
 import six.moves.urllib.parse as urlparse
 
+from glance import i18n
+
+_ = i18n._
+
 store_type_opts = [
     cfg.ListOpt("store_type_preference",
                 default=[],
diff --git a/glance/common/property_utils.py b/glance/common/property_utils.py
index 66e9afdc1f..1ed15a79e8 100644
--- a/glance/common/property_utils.py
+++ b/glance/common/property_utils.py
@@ -23,6 +23,7 @@ from oslo.config import cfg
 
 import glance.api.policy
 from glance.common import exception
+from glance import i18n
 from glance.openstack.common import log as logging
 from glance.openstack.common import policy
 
@@ -30,6 +31,7 @@ from glance.openstack.common import policy
 # we must set manually for compatibility with py26
 CONFIG = ConfigParser.SafeConfigParser(dict_type=OrderedDict)
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 property_opts = [
     cfg.StrOpt('property_protection_file',
diff --git a/glance/common/rpc.py b/glance/common/rpc.py
index 0ed1b7277c..846548fd2a 100644
--- a/glance/common/rpc.py
+++ b/glance/common/rpc.py
@@ -29,9 +29,11 @@ from glance.common import client
 from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
+from glance import i18n
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 
 rpc_opts = [
diff --git a/glance/common/scripts/image_import/main.py b/glance/common/scripts/image_import/main.py
index 8cd2b14322..63ab9fa9b5 100644
--- a/glance/common/scripts/image_import/main.py
+++ b/glance/common/scripts/image_import/main.py
@@ -30,10 +30,11 @@ from glance.openstack.common import lockutils
 import glance.openstack.common.log as logging
 
 
+LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
-LOG = logging.getLogger(__name__)
 
 
 def run(t_id, context, task_repo, image_repo, image_factory):
diff --git a/glance/common/scripts/utils.py b/glance/common/scripts/utils.py
index 48f3aa3592..e6a0e1f76b 100644
--- a/glance/common/scripts/utils.py
+++ b/glance/common/scripts/utils.py
@@ -29,8 +29,9 @@ from glance import i18n
 import glance.openstack.common.log as logging
 
 
-_LE = i18n._LE
 LOG = logging.getLogger(__name__)
+_ = i18n._
+_LE = i18n._LE
 
 
 def get_task(task_repo, task_id):
diff --git a/glance/common/store_utils.py b/glance/common/store_utils.py
index c863de9284..022ca74b83 100644
--- a/glance/common/store_utils.py
+++ b/glance/common/store_utils.py
@@ -23,11 +23,11 @@ from glance import i18n
 import glance.openstack.common.log as logging
 from glance import scrubber
 
+LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LW = i18n._LW
 
-LOG = logging.getLogger(__name__)
-
 store_utils_opts = [
     cfg.BoolOpt('use_user_token', default=True,
                 help=_('Whether to pass through the user token when '
diff --git a/glance/common/swift_store_utils.py b/glance/common/swift_store_utils.py
index 47b5611db6..a139d0d797 100644
--- a/glance/common/swift_store_utils.py
+++ b/glance/common/swift_store_utils.py
@@ -21,8 +21,11 @@ except ImportError:
 from oslo.config import cfg
 
 from glance.common import exception
+from glance import i18n
 from glance.openstack.common import log as logging
 
+_ = i18n._
+
 swift_opts = [
     cfg.StrOpt('default_swift_reference',
                default="ref1",
diff --git a/glance/common/utils.py b/glance/common/utils.py
index 8d1b6737b0..3757a965b4 100644
--- a/glance/common/utils.py
+++ b/glance/common/utils.py
@@ -46,11 +46,13 @@ import six
 from webob import exc
 
 from glance.common import exception
+from glance import i18n
 import glance.openstack.common.log as logging
 
 CONF = cfg.CONF
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 FEATURE_BLACKLIST = ['content-length', 'content-type', 'x-image-meta-size']
 
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
index c6b1cee0ad..4e6b56ab65 100644
--- a/glance/common/wsgi.py
+++ b/glance/common/wsgi.py
@@ -49,6 +49,7 @@ from glance import i18n
 import glance.openstack.common.log as logging
 from glance.openstack.common import processutils
 
+_ = i18n._
 
 bind_opts = [
     cfg.StrOpt('bind_host', default='0.0.0.0',
diff --git a/glance/db/__init__.py b/glance/db/__init__.py
index ea2777d7bc..16b7ddaa00 100644
--- a/glance/db/__init__.py
+++ b/glance/db/__init__.py
@@ -26,6 +26,9 @@ from glance.common import exception
 from glance.common import location_strategy
 import glance.domain
 import glance.domain.proxy
+from glance import i18n
+
+_ = i18n._
 
 CONF = cfg.CONF
 CONF.import_opt('image_size_cap', 'glance.common.config')
diff --git a/glance/db/simple/api.py b/glance/db/simple/api.py
index 4dda548922..356ff74c81 100644
--- a/glance/db/simple/api.py
+++ b/glance/db/simple/api.py
@@ -27,6 +27,7 @@ import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LI = i18n._LI
 _LW = i18n._LW
 
diff --git a/glance/db/sqlalchemy/api.py b/glance/db/sqlalchemy/api.py
index 17f23ef8c7..831c545065 100644
--- a/glance/db/sqlalchemy/api.py
+++ b/glance/db/sqlalchemy/api.py
@@ -49,6 +49,7 @@ import glance.openstack.common.log as os_logging
 BASE = models.BASE
 sa_logger = None
 LOG = os_logging.getLogger(__name__)
+_ = i18n._
 _LI = i18n._LI
 _LW = i18n._LW
 
diff --git a/glance/db/sqlalchemy/metadata.py b/glance/db/sqlalchemy/metadata.py
index accfac4651..5ebc22453d 100644
--- a/glance/db/sqlalchemy/metadata.py
+++ b/glance/db/sqlalchemy/metadata.py
@@ -35,6 +35,7 @@ from glance import i18n
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LW = i18n._LW
 _LI = i18n._LI
diff --git a/glance/db/sqlalchemy/metadef_api/namespace.py b/glance/db/sqlalchemy/metadef_api/namespace.py
index 5c77a28b07..2525a7c851 100644
--- a/glance/db/sqlalchemy/metadef_api/namespace.py
+++ b/glance/db/sqlalchemy/metadef_api/namespace.py
@@ -25,6 +25,7 @@ from glance import i18n
 import glance.openstack.common.log as os_logging
 
 LOG = os_logging.getLogger(__name__)
+_ = i18n._
 _LW = i18n._LW
 
 
diff --git a/glance/db/sqlalchemy/metadef_api/object.py b/glance/db/sqlalchemy/metadef_api/object.py
index d7b2feace8..fa17ba8497 100644
--- a/glance/db/sqlalchemy/metadef_api/object.py
+++ b/glance/db/sqlalchemy/metadef_api/object.py
@@ -25,6 +25,7 @@ from glance import i18n
 import glance.openstack.common.log as os_logging
 
 LOG = os_logging.getLogger(__name__)
+_ = i18n._
 _LW = i18n._LW
 
 
diff --git a/glance/db/sqlalchemy/metadef_api/property.py b/glance/db/sqlalchemy/metadef_api/property.py
index d420e9a4e4..b60dc88d88 100644
--- a/glance/db/sqlalchemy/metadef_api/property.py
+++ b/glance/db/sqlalchemy/metadef_api/property.py
@@ -25,6 +25,7 @@ from glance import i18n
 import glance.openstack.common.log as os_logging
 
 LOG = os_logging.getLogger(__name__)
+_ = i18n._
 _LW = i18n._LW
 
 
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
index 8b11f95d11..8f30067626 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py
@@ -22,6 +22,7 @@ from glance import i18n
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 
 
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
index 024b1f23af..de650e7482 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
@@ -41,6 +41,7 @@ from glance import i18n
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
diff --git a/glance/domain/__init__.py b/glance/domain/__init__.py
index fa4513dc32..87eef2196b 100644
--- a/glance/domain/__init__.py
+++ b/glance/domain/__init__.py
@@ -28,6 +28,7 @@ from glance.common import exception
 from glance import i18n
 import glance.openstack.common.log as logging
 
+_ = i18n._
 _LE = i18n._LE
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
diff --git a/glance/image_cache/__init__.py b/glance/image_cache/__init__.py
index 7bfd32eebf..48f2817104 100644
--- a/glance/image_cache/__init__.py
+++ b/glance/image_cache/__init__.py
@@ -30,6 +30,7 @@ from glance import i18n
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
diff --git a/glance/image_cache/client.py b/glance/image_cache/client.py
index 5723cb9286..fc3c773b79 100644
--- a/glance/image_cache/client.py
+++ b/glance/image_cache/client.py
@@ -19,6 +19,9 @@ from oslo.serialization import jsonutils as json
 
 from glance.common import client as base_client
 from glance.common import exception
+from glance import i18n
+
+_ = i18n._
 
 
 class CacheClient(base_client.BaseClient):
diff --git a/glance/image_cache/drivers/base.py b/glance/image_cache/drivers/base.py
index 9d72c6f49d..48db04ea0d 100644
--- a/glance/image_cache/drivers/base.py
+++ b/glance/image_cache/drivers/base.py
@@ -23,9 +23,11 @@ from oslo.config import cfg
 
 from glance.common import exception
 from glance.common import utils
+from glance import i18n
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 CONF = cfg.CONF
 
diff --git a/glance/image_cache/drivers/sqlite.py b/glance/image_cache/drivers/sqlite.py
index e55b9ea08d..d564504981 100644
--- a/glance/image_cache/drivers/sqlite.py
+++ b/glance/image_cache/drivers/sqlite.py
@@ -35,6 +35,7 @@ from glance.image_cache.drivers import base
 import glance.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
diff --git a/glance/location.py b/glance/location.py
index a079b0be9b..f82460f531 100644
--- a/glance/location.py
+++ b/glance/location.py
@@ -26,7 +26,7 @@ import glance.domain.proxy
 from glance import i18n
 import glance.openstack.common.log as logging
 
-
+_ = i18n._
 _LE = i18n._LE
 
 CONF = cfg.CONF
diff --git a/glance/notifier.py b/glance/notifier.py
index 35342da6ff..bec5137917 100644
--- a/glance/notifier.py
+++ b/glance/notifier.py
@@ -24,8 +24,11 @@ import webob
 from glance.common import exception
 from glance.common import utils
 import glance.domain.proxy
+from glance import i18n
 import glance.openstack.common.log as logging
 
+_ = i18n._
+
 notifier_opts = [
     cfg.StrOpt('default_publisher_id', default="image.localhost",
                help='Default publisher_id for outgoing notifications.'),
diff --git a/glance/opts.py b/glance/opts.py
index 96f30b968b..963587a49a 100644
--- a/glance/opts.py
+++ b/glance/opts.py
@@ -35,7 +35,6 @@ import glance.common.wsgi
 import glance.image_cache
 import glance.image_cache.drivers.sqlite
 import glance.notifier
-from glance.openstack.common import gettextutils
 import glance.openstack.common.lockutils
 import glance.openstack.common.log
 import glance.registry
@@ -43,10 +42,6 @@ import glance.registry.client
 import glance.registry.client.v1.api
 import glance.scrubber
 
-# TODO(zhiyan): Remove translation from in-line
-# help message of option definition code.
-gettextutils.install('glance', lazy=False)
-
 
 _global_opt_lists = [
     glance.openstack.common.log.common_cli_opts,
diff --git a/glance/quota/__init__.py b/glance/quota/__init__.py
index 163efbe6d2..cee7a866f8 100644
--- a/glance/quota/__init__.py
+++ b/glance/quota/__init__.py
@@ -29,6 +29,7 @@ import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LI = i18n._LI
 CONF = cfg.CONF
 CONF.import_opt('image_member_quota', 'glance.common.config')
diff --git a/glance/registry/__init__.py b/glance/registry/__init__.py
index ed51e08be8..a269c17c82 100644
--- a/glance/registry/__init__.py
+++ b/glance/registry/__init__.py
@@ -19,6 +19,9 @@ Registry API
 
 from oslo.config import cfg
 
+from glance import i18n
+
+_ = i18n._
 
 registry_addr_opts = [
     cfg.StrOpt('registry_host', default='0.0.0.0',
diff --git a/glance/registry/api/v1/images.py b/glance/registry/api/v1/images.py
index 91a2e43682..1bbfe01c68 100644
--- a/glance/registry/api/v1/images.py
+++ b/glance/registry/api/v1/images.py
@@ -31,6 +31,7 @@ import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 _LW = i18n._LW
diff --git a/glance/registry/api/v1/members.py b/glance/registry/api/v1/members.py
index 2913f0f2cf..084e10cd0e 100644
--- a/glance/registry/api/v1/members.py
+++ b/glance/registry/api/v1/members.py
@@ -24,6 +24,7 @@ import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LI = i18n._LI
 _LW = i18n._LW
 
diff --git a/glance/registry/api/v2/rpc.py b/glance/registry/api/v2/rpc.py
index faa6b55f7e..7e59a37530 100644
--- a/glance/registry/api/v2/rpc.py
+++ b/glance/registry/api/v2/rpc.py
@@ -22,10 +22,12 @@ from oslo.config import cfg
 from glance.common import rpc
 from glance.common import wsgi
 import glance.db
+from glance import i18n
 import glance.openstack.common.log as logging
 
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 CONF = cfg.CONF
 
diff --git a/glance/registry/client/__init__.py b/glance/registry/client/__init__.py
index 4617d29fab..8528c0ad3a 100644
--- a/glance/registry/client/__init__.py
+++ b/glance/registry/client/__init__.py
@@ -15,6 +15,10 @@
 
 from oslo.config import cfg
 
+from glance import i18n
+
+_ = i18n._
+
 registry_client_opts = [
     cfg.StrOpt('registry_client_protocol', default='http',
                help=_('The protocol to use for communication with the '
diff --git a/glance/registry/client/v1/api.py b/glance/registry/client/v1/api.py
index b2c93b526a..21ad154a69 100644
--- a/glance/registry/client/v1/api.py
+++ b/glance/registry/client/v1/api.py
@@ -23,10 +23,12 @@ from oslo.config import cfg
 from oslo.serialization import jsonutils
 
 from glance.common import exception
+from glance import i18n
 import glance.openstack.common.log as logging
 from glance.registry.client.v1 import client
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 registry_client_ctx_opts = [
     cfg.BoolOpt('send_identity_headers', default=False,
diff --git a/glance/registry/client/v2/api.py b/glance/registry/client/v2/api.py
index 717497c269..9d3854fd49 100644
--- a/glance/registry/client/v2/api.py
+++ b/glance/registry/client/v2/api.py
@@ -22,10 +22,12 @@ import os
 from oslo.config import cfg
 
 from glance.common import exception
+from glance import i18n
 import glance.openstack.common.log as logging
 from glance.registry.client.v2 import client
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 
 CONF = cfg.CONF
 _registry_client = 'glance.registry.client'
diff --git a/glance/schema.py b/glance/schema.py
index ef6cdfb874..4762c8c6f1 100644
--- a/glance/schema.py
+++ b/glance/schema.py
@@ -18,6 +18,9 @@ import six
 
 from glance.common import exception
 from glance.common import utils
+from glance import i18n
+
+_ = i18n._
 
 
 class Schema(object):
diff --git a/glance/scrubber.py b/glance/scrubber.py
index af0e37ae9f..943ff63f5e 100644
--- a/glance/scrubber.py
+++ b/glance/scrubber.py
@@ -34,6 +34,7 @@ import glance.registry.client.v1.api as registry
 
 LOG = logging.getLogger(__name__)
 
+_ = i18n._
 _LI = i18n._LI
 _LW = i18n._LW
 _LE = i18n._LE
diff --git a/glance/tests/functional/v2/test_metadef_resourcetypes.py b/glance/tests/functional/v2/test_metadef_resourcetypes.py
index bf8d8e5093..df80be825f 100644
--- a/glance/tests/functional/v2/test_metadef_resourcetypes.py
+++ b/glance/tests/functional/v2/test_metadef_resourcetypes.py
@@ -34,6 +34,7 @@ import glance.openstack.common.log as logging
 import glance.schema
 
 LOG = logging.getLogger(__name__)
+_ = i18n._
 _LE = i18n._LE
 _LI = i18n._LI
 
diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py
index 81c591aef9..4b96a2ba50 100644
--- a/glance/tests/unit/test_migrations.py
+++ b/glance/tests/unit/test_migrations.py
@@ -48,7 +48,9 @@ from glance.db import migration
 from glance.db.sqlalchemy import migrate_repo
 from glance.db.sqlalchemy.migrate_repo.schema import from_migration_import
 from glance.db.sqlalchemy import models
+from glance import i18n
 
+_ = i18n._
 
 CONF = cfg.CONF
 CONF.import_opt('metadata_encryption_key', 'glance.common.config')
diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py
index 395f69d2d2..220935acd8 100644
--- a/glance/tests/unit/v2/test_registry_client.py
+++ b/glance/tests/unit/v2/test_registry_client.py
@@ -31,12 +31,14 @@ from glance.common import config
 from glance.common import exception
 from glance import context
 from glance.db.sqlalchemy import api as db_api
+from glance import i18n
 from glance.registry.api import v2 as rserver
 import glance.registry.client.v2.api as rapi
 from glance.registry.client.v2.api import client as rclient
 from glance.tests.unit import base
 from glance.tests import utils as test_utils
 
+_ = i18n._
 
 _gen_uuid = lambda: str(uuid.uuid4())
 
diff --git a/tox.ini b/tox.ini
index c4b5390f4d..6c5767ad90 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,7 +50,6 @@ commands = python setup.py build_sphinx
 # H405  multi line docstring summary not separated with an empty line
 # H904  Wrap long lines in parentheses instead of a backslash
 ignore = E711,E712,H302,H402,H404,H405,H904
-builtins = _
 exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*openstack/common*,*lib/python*,*egg,build
 
 [hacking]