Merge "Fix missing translations for log messages"

diff --cc cinder/tests/unit/test_glusterfs.py
Simple merge

diff --cc cinder/volume/drivers/emc/emc_vmax_common.py
Simple merge

diff --cc cinder/volume/drivers/emc/emc_vmax_fc.py
Simple merge

diff --cc cinder/volume/drivers/emc/emc_vmax_iscsi.py
Simple merge

diff --cc cinder/volume/drivers/glusterfs.py
Simple merge

diff --cc cinder/volume/drivers/lvm.py
index 855a2df6dfed2c5fa578c16d9c5ddf28eac842b5,530e8742dcf29d975b5080a5b4dbfc7f52fdc68d..a041f7b81886d4fa813f1dcaa1c6f06cf9c9bc1d
--- 1/cinder/volume/drivers/lvm.py
--- 2/cinder/volume/drivers/lvm.py
+++ b/cinder/volume/drivers/lvm.py
@@@ -24,7 -24,9 +24,8 @@@ from oslo_config import cf
  from oslo_log import log as logging
  from oslo_utils import importutils
  from oslo_utils import units
+ import six
  
 -from cinder.brick import exception as brick_exception
  from cinder.brick.local_dev import lvm as lvm
  from cinder import exception
  from cinder.i18n import _, _LE, _LI, _LW

diff --cc cinder/volume/drivers/nfs.py
Simple merge

diff --cc cinder/volume/drivers/remotefs.py
Simple merge

diff --cc cinder/volume/drivers/smbfs.py
Simple merge

diff --cc cinder/volume/drivers/windows/remotefs.py
Simple merge