From: OpenStack Jenkins <jenkins@openstack.org>
Date: Sun, 15 Sep 2013 06:07:22 +0000 (+0000)
Subject: Imported Translations from Transifex
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=53bfde8992e945807aa45f3a1d0d6dd816b5b9a4;p=openstack-build%2Fcinder-build.git

Imported Translations from Transifex

Change-Id: Ibfc1ad7197f940208688d234d859da76344aeaba
---

diff --git a/cinder/locale/ar/LC_MESSAGES/cinder.po b/cinder/locale/ar/LC_MESSAGES/cinder.po
new file mode 100644
index 000000000..c89bfe74c
--- /dev/null
+++ b/cinder/locale/ar/LC_MESSAGES/cinder.po
@@ -0,0 +1,9269 @@
+# Arabic translations for cinder.
+# Copyright (C) 2013 ORGANIZATION
+# This file is distributed under the same license as the cinder project.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version:  Cinder\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
+"PO-Revision-Date: 2013-09-12 07:56+0000\n"
+"Last-Translator: Tom Fifield <tom@openstack.org>\n"
+"Language-Team: Arabic "
+"(http://www.transifex.com/projects/p/openstack/language/ar/)\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : "
+"n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+
+#: cinder/context.py:62
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: cinder/context.py:102
+#, python-format
+msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
+msgstr ""
+
+#: cinder/exception.py:68 cinder/brick/exception.py:39
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: cinder/exception.py:90 cinder/brick/exception.py:61
+#: cinder/openstack/common/rpc/common.py:86
+msgid "Exception in string format operation"
+msgstr ""
+
+#: cinder/exception.py:109
+#, python-format
+msgid "Connection to glance failed: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:113
+msgid "Not authorized."
+msgstr ""
+
+#: cinder/exception.py:118
+msgid "User does not have admin privileges"
+msgstr ""
+
+#: cinder/exception.py:122
+#, python-format
+msgid "Policy doesn't allow %(action)s to be performed."
+msgstr ""
+
+#: cinder/exception.py:126
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: cinder/exception.py:130 cinder/brick/exception.py:81
+msgid "Unacceptable parameters."
+msgstr ""
+
+#: cinder/exception.py:135
+#, python-format
+msgid "Invalid snapshot: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:139
+#, python-format
+msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/exception.py:144
+#, python-format
+msgid "Volume %(volume_id)s is still attached, detach volume first."
+msgstr ""
+
+#: cinder/exception.py:148
+msgid "Failed to load data into json format"
+msgstr ""
+
+#: cinder/exception.py:152
+msgid "The results are invalid."
+msgstr ""
+
+#: cinder/exception.py:156
+#, python-format
+msgid "Invalid input received: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:160
+#, python-format
+msgid "Invalid volume type: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:164
+#, python-format
+msgid "Invalid volume: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:168
+#, python-format
+msgid "Invalid content type %(content_type)s."
+msgstr ""
+
+#: cinder/exception.py:172
+#, python-format
+msgid "Invalid host: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:178 cinder/brick/exception.py:88
+#, python-format
+msgid "%(err)s"
+msgstr ""
+
+#: cinder/exception.py:182
+#, python-format
+msgid "Invalid auth key: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:186
+msgid "Service is unavailable at this time."
+msgstr ""
+
+#: cinder/exception.py:190
+#, python-format
+msgid "Image %(image_id)s is unacceptable: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:194
+#, python-format
+msgid "The device in the path %(path)s is unavailable: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:198
+#, python-format
+msgid "Expected a uuid but received %(uuid)s."
+msgstr ""
+
+#: cinder/exception.py:202 cinder/brick/exception.py:75
+msgid "Resource could not be found."
+msgstr ""
+
+#: cinder/exception.py:208
+#, python-format
+msgid "Volume %(volume_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:212
+#, python-format
+msgid "Unable to locate account %(account_name)s on Solidfire device"
+msgstr ""
+
+#: cinder/exception.py:217
+#, python-format
+msgid "Volume not found for instance %(instance_id)s."
+msgstr ""
+
+#: cinder/exception.py:221
+#, python-format
+msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: cinder/exception.py:226
+#, python-format
+msgid ""
+"Volume %(volume_id)s has no administration metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: cinder/exception.py:231
+#, python-format
+msgid "Invalid metadata: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:235
+#, python-format
+msgid "Invalid metadata size: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:239
+#, python-format
+msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
+msgstr ""
+
+#: cinder/exception.py:244
+#, python-format
+msgid "Volume type %(volume_type_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:248
+#, python-format
+msgid "Volume type with name %(volume_type_name)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:253
+#, python-format
+msgid ""
+"Volume Type %(volume_type_id)s has no extra specs with key "
+"%(extra_specs_key)s."
+msgstr ""
+
+#: cinder/exception.py:258
+#, python-format
+msgid ""
+"Volume Type %(volume_type_id)s deletion is not allowed with volumes "
+"present with the type."
+msgstr ""
+
+#: cinder/exception.py:263
+#, python-format
+msgid "Snapshot %(snapshot_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:267
+#, python-format
+msgid "deleting volume %(volume_name)s that has snapshot"
+msgstr ""
+
+#: cinder/exception.py:271
+#, python-format
+msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
+msgstr ""
+
+#: cinder/exception.py:276
+#, python-format
+msgid "No target id found for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/exception.py:280
+#, python-format
+msgid "Invalid image href %(image_href)s."
+msgstr ""
+
+#: cinder/exception.py:284
+#, python-format
+msgid "Image %(image_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:288
+#, python-format
+msgid "Service %(service_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:292
+#, python-format
+msgid "Host %(host)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:296
+#, python-format
+msgid "Scheduler Host Filter %(filter_name)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:300
+#, python-format
+msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:304
+#, python-format
+msgid "Could not find binary %(binary)s on host %(host)s."
+msgstr ""
+
+#: cinder/exception.py:308
+#, python-format
+msgid "Invalid reservation expiration %(expire)s."
+msgstr ""
+
+#: cinder/exception.py:312
+#, python-format
+msgid ""
+"Change would make usage less than 0 for the following resources: "
+"%(unders)s"
+msgstr ""
+
+#: cinder/exception.py:317
+msgid "Quota could not be found"
+msgstr ""
+
+#: cinder/exception.py:321
+#, python-format
+msgid "Unknown quota resources %(unknown)s."
+msgstr ""
+
+#: cinder/exception.py:325
+#, python-format
+msgid "Quota for project %(project_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:329
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:333
+#, python-format
+msgid "Quota usage for project %(project_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:337
+#, python-format
+msgid "Quota reservation %(uuid)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:341
+#, python-format
+msgid "Quota exceeded for resources: %(overs)s"
+msgstr ""
+
+#: cinder/exception.py:345
+#, python-format
+msgid "Migration %(migration_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:349
+#, python-format
+msgid "File %(file_path)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:358
+#, python-format
+msgid "Volume Type %(id)s already exists."
+msgstr ""
+
+#: cinder/exception.py:362
+#, python-format
+msgid "Volume type encryption for type %(type_id)s already exists."
+msgstr ""
+
+#: cinder/exception.py:366
+#, python-format
+msgid "Malformed message body: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:370
+#, python-format
+msgid "Could not find config at %(path)s"
+msgstr ""
+
+#: cinder/exception.py:374
+#, python-format
+msgid "Could not find parameter %(param)s"
+msgstr ""
+
+#: cinder/exception.py:378
+#, python-format
+msgid "Could not load paste app '%(name)s' from %(path)s"
+msgstr ""
+
+#: cinder/exception.py:382
+#, python-format
+msgid "No valid host was found. %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:386
+#, python-format
+msgid "Host %(host)s is not up or doesn't exist."
+msgstr ""
+
+#: cinder/exception.py:390
+#, python-format
+msgid "Quota exceeded: code=%(code)s"
+msgstr ""
+
+#: cinder/exception.py:397
+msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
+msgstr ""
+
+#: cinder/exception.py:402
+#, python-format
+msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
+msgstr ""
+
+#: cinder/exception.py:406
+#, python-format
+msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
+msgstr ""
+
+#: cinder/exception.py:410
+#, python-format
+msgid "Detected more than one volume with name %(vol_name)s"
+msgstr ""
+
+#: cinder/exception.py:414
+#, python-format
+msgid "Invalid 3PAR Domain: %(err)s"
+msgstr ""
+
+#: cinder/exception.py:418
+#, python-format
+msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
+msgstr ""
+
+#: cinder/exception.py:423
+msgid "Bad response from SolidFire API"
+msgstr ""
+
+#: cinder/exception.py:427
+#, python-format
+msgid "Error in SolidFire API response: data=%(data)s"
+msgstr ""
+
+#: cinder/exception.py:431
+#, python-format
+msgid "Unknown or unsupported command %(cmd)s"
+msgstr ""
+
+#: cinder/exception.py:435
+#, python-format
+msgid "Malformed response to command %(cmd)s: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:439
+#, python-format
+msgid "Bad HTTP response status %(status)s"
+msgstr ""
+
+#: cinder/exception.py:443
+#, python-format
+msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
+msgstr ""
+
+#: cinder/exception.py:447
+#, python-format
+msgid "Unable to create server object for initiator %(name)s"
+msgstr ""
+
+#: cinder/exception.py:451
+#, python-format
+msgid "Unable to find server object for initiator %(name)s"
+msgstr ""
+
+#: cinder/exception.py:455
+msgid "Unable to find any active VPSA controller"
+msgstr ""
+
+#: cinder/exception.py:459
+#, python-format
+msgid "Failed to retrieve attachments for volume %(name)s"
+msgstr ""
+
+#: cinder/exception.py:463
+#, python-format
+msgid "Invalid attachment info for volume %(name)s: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:467
+#, python-format
+msgid "Instance %(instance_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:471
+#, python-format
+msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
+msgstr ""
+
+#: cinder/exception.py:476
+msgid "Unknown NFS exception"
+msgstr ""
+
+#: cinder/exception.py:480
+msgid "No mounted NFS shares found"
+msgstr ""
+
+#: cinder/exception.py:484 cinder/exception.py:496
+#, python-format
+msgid "There is no share which can host %(volume_size)sG"
+msgstr ""
+
+#: cinder/exception.py:488
+msgid "Unknown Gluster exception"
+msgstr ""
+
+#: cinder/exception.py:492
+msgid "No mounted Gluster shares found"
+msgstr ""
+
+#: cinder/exception.py:500
+#, python-format
+msgid ""
+"Glance metadata cannot be updated, key %(key)s exists for volume id "
+"%(volume_id)s"
+msgstr ""
+
+#: cinder/exception.py:505
+#, python-format
+msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
+msgstr ""
+
+#: cinder/exception.py:509
+#, python-format
+msgid "Failed to export for volume: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:513
+#, python-format
+msgid "Failed to create metadata for volume: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:517
+#, python-format
+msgid "Failed to update metadata for volume: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:521
+#, python-format
+msgid "Failed to copy metadata to volume: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:525
+#, python-format
+msgid "Failed to copy image to volume: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:529
+msgid "Invalid Ceph args provided for backup rbd operation"
+msgstr ""
+
+#: cinder/exception.py:533
+msgid "An error has occurred during backup operation"
+msgstr ""
+
+#: cinder/exception.py:537
+msgid "Backup RBD operation failed"
+msgstr ""
+
+#: cinder/exception.py:541
+#, python-format
+msgid "Backup %(backup_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:545
+#, python-format
+msgid "Invalid backup: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:549
+#, python-format
+msgid "Connection to swift failed: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:553
+#, python-format
+msgid "Transfer %(transfer_id)s could not be found."
+msgstr ""
+
+#: cinder/exception.py:557
+#, python-format
+msgid "Volume migration failed: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:561
+#, python-format
+msgid "SSH command injection detected: %(command)s"
+msgstr ""
+
+#: cinder/exception.py:565
+msgid "Coraid Cinder Driver exception."
+msgstr ""
+
+#: cinder/exception.py:569
+msgid "Failed to encode json data."
+msgstr ""
+
+#: cinder/exception.py:573
+msgid "Login on ESM failed."
+msgstr ""
+
+#: cinder/exception.py:577
+msgid "Relogin on ESM failed."
+msgstr ""
+
+#: cinder/exception.py:581
+#, python-format
+msgid "Group with name \"%(group_name)s\" not found."
+msgstr ""
+
+#: cinder/exception.py:585
+#, python-format
+msgid "ESM configure request failed: %(message)s."
+msgstr ""
+
+#: cinder/exception.py:589
+#, python-format
+msgid "Coraid ESM not available with reason: %(reason)s."
+msgstr ""
+
+#: cinder/exception.py:593
+#, python-format
+msgid "QoS Specs %(specs_id)s already exists."
+msgstr ""
+
+#: cinder/exception.py:597
+#, python-format
+msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
+msgstr ""
+
+#: cinder/exception.py:602
+#, python-format
+msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
+msgstr ""
+
+#: cinder/exception.py:607
+#, python-format
+msgid "No such QoS spec %(specs_id)s."
+msgstr ""
+
+#: cinder/exception.py:611
+#, python-format
+msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
+msgstr ""
+
+#: cinder/exception.py:616
+#, python-format
+msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
+msgstr ""
+
+#: cinder/exception.py:621
+#, python-format
+msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
+msgstr ""
+
+#: cinder/exception.py:626
+#, python-format
+msgid "Invalid qos specs: %(reason)s"
+msgstr ""
+
+#: cinder/exception.py:630
+#, python-format
+msgid "QoS Specs %(specs_id)s is still associated with entities."
+msgstr ""
+
+#: cinder/manager.py:135
+msgid "Notifying Schedulers of capabilities ..."
+msgstr ""
+
+#: cinder/policy.py:31
+msgid "JSON file representing policy"
+msgstr ""
+
+#: cinder/policy.py:34
+msgid "Rule checked when requested rule is not found"
+msgstr ""
+
+#: cinder/quota.py:106
+#, python-format
+msgid ""
+"Default quota for resource: %(res)s is set by the default quota flag: "
+"quota_%(res)s, it is now deprecated. Please use the the default quota "
+"class for default quota."
+msgstr ""
+
+#: cinder/quota.py:759
+#, python-format
+msgid "Created reservations %s"
+msgstr ""
+
+#: cinder/quota.py:781
+#, python-format
+msgid "Failed to commit reservations %s"
+msgstr ""
+
+#: cinder/quota.py:801
+#, python-format
+msgid "Failed to roll back reservations %s"
+msgstr ""
+
+#: cinder/quota.py:888
+msgid "Cannot register resource"
+msgstr ""
+
+#: cinder/quota.py:891
+msgid "Cannot register resources"
+msgstr ""
+
+#: cinder/service.py:125
+msgid "SIGTERM received"
+msgstr ""
+
+#: cinder/service.py:175 cinder/openstack/common/service.py:165
+msgid "Parent process has died unexpectedly, exiting"
+msgstr ""
+
+#: cinder/service.py:214 cinder/openstack/common/service.py:201
+msgid "Forking too fast, sleeping"
+msgstr ""
+
+#: cinder/service.py:232 cinder/openstack/common/service.py:122
+#: cinder/openstack/common/service.py:219
+#, python-format
+msgid "Caught %s, exiting"
+msgstr ""
+
+#: cinder/service.py:237 cinder/openstack/common/service.py:224
+msgid "Unhandled exception"
+msgstr ""
+
+#: cinder/service.py:244 cinder/openstack/common/service.py:231
+#, python-format
+msgid "Started child %d"
+msgstr ""
+
+#: cinder/service.py:254 cinder/openstack/common/service.py:241
+#, python-format
+msgid "Starting %d workers"
+msgstr ""
+
+#: cinder/service.py:273 cinder/openstack/common/service.py:258
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr ""
+
+#: cinder/service.py:277
+#, python-format
+msgid "Child %(pid)d exited with status %(code)d"
+msgstr ""
+
+#: cinder/service.py:281 cinder/openstack/common/service.py:266
+#, python-format
+msgid "pid %d not in child list"
+msgstr ""
+
+#: cinder/service.py:289
+#, python-format
+msgid "_wait_child %d"
+msgstr ""
+
+#: cinder/service.py:305
+#, python-format
+msgid "wait wrap.failed %s"
+msgstr ""
+
+#: cinder/service.py:313 cinder/openstack/common/service.py:294
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr ""
+
+#: cinder/service.py:324 cinder/openstack/common/service.py:305
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr ""
+
+#: cinder/service.py:357
+#, python-format
+msgid "Starting %(topic)s node (version %(version_string)s)"
+msgstr ""
+
+#: cinder/service.py:370 cinder/openstack/common/rpc/service.py:47
+#, python-format
+msgid "Creating Consumer connection for Service %s"
+msgstr ""
+
+#: cinder/service.py:462
+msgid "Service killed that has no database entry"
+msgstr ""
+
+#: cinder/service.py:499
+msgid "The service database object disappeared, Recreating it."
+msgstr ""
+
+#: cinder/service.py:514
+msgid "Recovered model server connection!"
+msgstr ""
+
+#: cinder/service.py:520
+msgid "model server went away"
+msgstr ""
+
+#: cinder/service.py:612 cinder/openstack/common/service.py:113
+#: cinder/openstack/common/service.py:276
+msgid "Full set of CONF:"
+msgstr ""
+
+#: cinder/service.py:619
+#, python-format
+msgid "%s : FLAG SET "
+msgstr ""
+
+#: cinder/utils.py:103
+#, python-format
+msgid "Can not translate %s to integer."
+msgstr ""
+
+#: cinder/utils.py:134
+#, python-format
+msgid "May specify only one of %s"
+msgstr ""
+
+#: cinder/utils.py:208
+msgid "Specify a password or private_key"
+msgstr ""
+
+#: cinder/utils.py:224
+#, python-format
+msgid "Error connecting via ssh: %s"
+msgstr ""
+
+#: cinder/utils.py:407
+#, python-format
+msgid "Invalid backend: %s"
+msgstr ""
+
+#: cinder/utils.py:418
+#, python-format
+msgid "backend %s"
+msgstr ""
+
+#: cinder/utils.py:468
+msgid "in looping call"
+msgstr ""
+
+#: cinder/utils.py:753
+#, python-format
+msgid "Could not remove tmpdir: %s"
+msgstr ""
+
+#: cinder/wsgi.py:122
+#, python-format
+msgid "Unable to find cert_file : %s"
+msgstr ""
+
+#: cinder/wsgi.py:125
+#, python-format
+msgid "Unable to find ca_file : %s"
+msgstr ""
+
+#: cinder/wsgi.py:128
+#, python-format
+msgid "Unable to find key_file : %s"
+msgstr ""
+
+#: cinder/wsgi.py:131
+msgid ""
+"When running server in SSL mode, you must specify both a cert_file and "
+"key_file option value in your configuration file"
+msgstr ""
+
+#: cinder/wsgi.py:164
+#, python-format
+msgid "Could not bind to %(host)s:%(port)s after trying for 30 seconds"
+msgstr ""
+
+#: cinder/wsgi.py:208
+#, python-format
+msgid "Started %(name)s on %(host)s:%(port)s"
+msgstr ""
+
+#: cinder/wsgi.py:228
+msgid "Stopping WSGI server."
+msgstr ""
+
+#: cinder/wsgi.py:242
+msgid "WSGI server has stopped."
+msgstr ""
+
+#: cinder/wsgi.py:311
+msgid "You must implement __call__"
+msgstr ""
+
+#: cinder/api/auth.py:26
+msgid ""
+"cinder.api.auth:CinderKeystoneContext is deprecated. Please use "
+"cinder.api.middleware.auth:CinderKeystoneContext instead."
+msgstr ""
+
+#: cinder/api/auth.py:34
+msgid ""
+"cinder.api.auth:pipeline_factory is deprecated. Please use "
+"cinder.api.middleware.auth:pipeline_factory instead."
+msgstr ""
+
+#: cinder/api/common.py:78 cinder/api/common.py:112 cinder/volume/api.py:268
+msgid "limit param must be an integer"
+msgstr ""
+
+#: cinder/api/common.py:81 cinder/api/common.py:116 cinder/volume/api.py:265
+msgid "limit param must be positive"
+msgstr ""
+
+#: cinder/api/common.py:106
+msgid "offset param must be an integer"
+msgstr ""
+
+#: cinder/api/common.py:120
+msgid "offset param must be positive"
+msgstr ""
+
+#: cinder/api/common.py:148
+#, python-format
+msgid "marker [%s] not found"
+msgstr ""
+
+#: cinder/api/common.py:175
+#, python-format
+msgid "href %s does not contain version"
+msgstr ""
+
+#: cinder/api/extensions.py:184
+msgid "Initializing extension manager."
+msgstr ""
+
+#: cinder/api/extensions.py:199
+#, python-format
+msgid "Loaded extension: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:237
+#, python-format
+msgid "Ext name: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:238
+#, python-format
+msgid "Ext alias: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:239
+#, python-format
+msgid "Ext description: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:241
+#, python-format
+msgid "Ext namespace: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:242
+#, python-format
+msgid "Ext updated: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:244
+#, python-format
+msgid "Exception loading extension: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:258
+#, python-format
+msgid "Loading extension %s"
+msgstr ""
+
+#: cinder/api/extensions.py:264
+#, python-format
+msgid "Calling extension factory %s"
+msgstr ""
+
+#: cinder/api/extensions.py:278
+#, python-format
+msgid "osapi_volume_extension is set to deprecated path: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:280
+#, python-format
+msgid ""
+"Please set your flag or cinder.conf settings for osapi_volume_extension "
+"to: %s"
+msgstr ""
+
+#: cinder/api/extensions.py:289
+#, python-format
+msgid "Failed to load extension %(ext_factory)s: %(exc)s"
+msgstr ""
+
+#: cinder/api/extensions.py:358
+#, python-format
+msgid "Failed to load extension %(classpath)s: %(exc)s"
+msgstr ""
+
+#: cinder/api/extensions.py:383
+#, python-format
+msgid "Failed to load extension %(ext_name)s: %(exc)s"
+msgstr ""
+
+#: cinder/api/sizelimit.py:25
+msgid ""
+"cinder.api.sizelimit:RequestBodySizeLimiter is deprecated. Please use "
+"cinder.api.middleware.sizelimit:RequestBodySizeLimiter instead"
+msgstr ""
+
+#: cinder/api/xmlutil.py:268
+msgid "element is not a child"
+msgstr ""
+
+#: cinder/api/xmlutil.py:465
+msgid "root element selecting a list"
+msgstr ""
+
+#: cinder/api/xmlutil.py:788
+#, python-format
+msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
+msgstr ""
+
+#: cinder/api/xmlutil.py:909
+msgid "subclasses must implement construct()!"
+msgstr ""
+
+#: cinder/api/contrib/admin_actions.py:80
+#, python-format
+msgid "Updating %(resource)s '%(id)s' with '%(update)r'"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:128
+#, python-format
+msgid "show called for member %s"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:140
+#, python-format
+msgid "delete called for member %s"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:143
+#, python-format
+msgid "Delete backup with id: %s"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:185
+#, python-format
+msgid "Creating new backup %s"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:195 cinder/api/contrib/backups.py:234
+#: cinder/api/contrib/volume_transfer.py:159
+#: cinder/api/contrib/volume_transfer.py:195
+msgid "Incorrect request body format"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:201
+#, python-format
+msgid "Creating backup of volume %(volume_id)s in container %(container)s"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:224
+#, python-format
+msgid "Restoring backup %(backup_id)s (%(body)s)"
+msgstr ""
+
+#: cinder/api/contrib/backups.py:238
+#, python-format
+msgid "Restoring backup %(backup_id)s to volume %(volume_id)s"
+msgstr ""
+
+#: cinder/api/contrib/extended_snapshot_attributes.py:60
+msgid "Snapshot not found."
+msgstr ""
+
+#: cinder/api/contrib/hosts.py:86 cinder/api/openstack/wsgi.py:171
+msgid "cannot understand XML"
+msgstr ""
+
+#: cinder/api/contrib/hosts.py:136
+#, python-format
+msgid "Host '%s' could not be found."
+msgstr ""
+
+#: cinder/api/contrib/hosts.py:165
+#, python-format
+msgid "Invalid status: '%s'"
+msgstr ""
+
+#: cinder/api/contrib/hosts.py:168
+#, python-format
+msgid "Invalid update setting: '%s'"
+msgstr ""
+
+#: cinder/api/contrib/hosts.py:180
+#, python-format
+msgid "Setting host %(host)s to %(state)s."
+msgstr ""
+
+#: cinder/api/contrib/hosts.py:206
+msgid "Describe-resource is admin only functionality"
+msgstr ""
+
+#: cinder/api/contrib/hosts.py:214
+msgid "Host not found"
+msgstr ""
+
+#: cinder/api/contrib/qos_specs_manage.py:98
+msgid "Please specify a name for QoS specs."
+msgstr ""
+
+#: cinder/api/contrib/qos_specs_manage.py:207
+msgid "Failed to disassociate qos specs."
+msgstr ""
+
+#: cinder/api/contrib/qos_specs_manage.py:209
+msgid "Qos specs still in use."
+msgstr ""
+
+#: cinder/api/contrib/qos_specs_manage.py:285
+#: cinder/api/contrib/qos_specs_manage.py:338
+msgid "Volume Type id must not be None."
+msgstr ""
+
+#: cinder/api/contrib/quotas.py:59
+msgid "Quota limit must be specified as an integer value."
+msgstr ""
+
+#: cinder/api/contrib/quotas.py:64
+msgid "Quota limit must be -1 or greater."
+msgstr ""
+
+#: cinder/api/contrib/scheduler_hints.py:38
+msgid "Malformed scheduler_hints attribute"
+msgstr ""
+
+#: cinder/api/contrib/services.py:85
+msgid ""
+"Query by service parameter is deprecated. Please use binary parameter "
+"instead."
+msgstr ""
+
+#: cinder/api/contrib/snapshot_actions.py:58
+#, python-format
+msgid "Snapshot status %(cur)s not allowed for update_snapshot_status"
+msgstr ""
+
+#: cinder/api/contrib/snapshot_actions.py:64
+#, python-format
+msgid ""
+"Provided snapshot status %(provided)s not allowed for snapshot with "
+"status %(current)s."
+msgstr ""
+
+#: cinder/api/contrib/snapshot_actions.py:76
+msgid "progress must be an integer percentage"
+msgstr ""
+
+#: cinder/api/contrib/types_extra_specs.py:102
+msgid "Request body empty"
+msgstr ""
+
+#: cinder/api/contrib/types_extra_specs.py:106
+#: cinder/api/v1/snapshot_metadata.py:77 cinder/api/v1/volume_metadata.py:77
+#: cinder/api/v2/snapshot_metadata.py:77
+msgid "Request body and URI mismatch"
+msgstr ""
+
+#: cinder/api/contrib/types_extra_specs.py:109
+#: cinder/api/v1/snapshot_metadata.py:81 cinder/api/v1/volume_metadata.py:81
+#: cinder/api/v2/snapshot_metadata.py:81
+msgid "Request body contains too many items"
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:94
+#, python-format
+msgid ""
+"Invalid request to attach volume to an instance %(instance_uuid)s and a "
+"host %(host_name)s simultaneously"
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:102
+msgid "Invalid request to attach volume to an invalid target"
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:106
+msgid ""
+"Invalid request to attach volume with an invalid mode. Attaching mode "
+"should be 'rw' or 'ro'"
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:184
+msgid "Invalid request body"
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:188
+msgid "No image_name was specified in request."
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:224
+msgid "New volume size must be specified as an integer."
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:238
+msgid "No 'os-update_readonly_flag' was specified in request."
+msgstr ""
+
+#: cinder/api/contrib/volume_actions.py:245
+msgid "Volume 'readonly' flag must be specified in request as a boolean."
+msgstr ""
+
+#: cinder/api/contrib/volume_transfer.py:133
+msgid "Listing volume transfers"
+msgstr ""
+
+#: cinder/api/contrib/volume_transfer.py:149
+#, python-format
+msgid "Creating new volume transfer %s"
+msgstr ""
+
+#: cinder/api/contrib/volume_transfer.py:164
+#, python-format
+msgid "Creating transfer of volume %s"
+msgstr ""
+
+#: cinder/api/contrib/volume_transfer.py:185
+#, python-format
+msgid "Accepting volume transfer %s"
+msgstr ""
+
+#: cinder/api/contrib/volume_transfer.py:198
+#, python-format
+msgid "Accepting transfer %s"
+msgstr ""
+
+#: cinder/api/contrib/volume_transfer.py:219
+#, python-format
+msgid "Delete transfer with id: %s"
+msgstr ""
+
+#: cinder/api/contrib/volume_type_encryption.py:66
+msgid "key_size must be non-negative"
+msgstr ""
+
+#: cinder/api/contrib/volume_type_encryption.py:69
+msgid "key_size must be an integer"
+msgstr ""
+
+#: cinder/api/contrib/volume_type_encryption.py:75
+msgid "provider must be defined"
+msgstr ""
+
+#: cinder/api/contrib/volume_type_encryption.py:77
+msgid "control_location must be defined"
+msgstr ""
+
+#: cinder/api/contrib/volume_type_encryption.py:85
+#, python-format
+msgid "Valid control location are: %s"
+msgstr ""
+
+#: cinder/api/contrib/volume_type_encryption.py:103
+msgid "Create body is not valid."
+msgstr ""
+
+#: cinder/api/middleware/auth.py:110
+msgid "Invalid service catalog json."
+msgstr ""
+
+#: cinder/api/middleware/fault.py:45
+#, python-format
+msgid "Caught error: %s"
+msgstr ""
+
+#: cinder/api/middleware/fault.py:54 cinder/api/openstack/wsgi.py:907
+#, python-format
+msgid "%(url)s returned with HTTP %(status)d"
+msgstr ""
+
+#: cinder/api/middleware/sizelimit.py:56 cinder/api/middleware/sizelimit.py:65
+#: cinder/api/middleware/sizelimit.py:79
+msgid "Request is too large."
+msgstr ""
+
+#: cinder/api/openstack/__init__.py:73
+msgid "Must specify an ExtensionManager class"
+msgstr ""
+
+#: cinder/api/openstack/__init__.py:84
+#, python-format
+msgid "Extended resource: %s"
+msgstr ""
+
+#: cinder/api/openstack/__init__.py:108
+#, python-format
+msgid ""
+"Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
+"resource"
+msgstr ""
+
+#: cinder/api/openstack/__init__.py:114
+#, python-format
+msgid "Extension %(ext_name)s extending resource: %(collection)s"
+msgstr ""
+
+#: cinder/api/openstack/__init__.py:130
+msgid ""
+"cinder.api.openstack:FaultWrapper is deprecated. Please use "
+"cinder.api.middleware.fault:FaultWrapper instead."
+msgstr ""
+
+#: cinder/api/openstack/urlmap.py:25
+msgid ""
+"cinder.api.openstack.urlmap:urlmap_factory is deprecated. Please use "
+"cinder.api.urlmap:urlmap_factory instead."
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:147 cinder/api/openstack/wsgi.py:559
+msgid "cannot understand JSON"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:564
+msgid "too many body keys"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:602
+#, python-format
+msgid "Exception handling resource: %s"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:607
+#, python-format
+msgid "Fault thrown: %s"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:610
+#, python-format
+msgid "HTTP exception thrown: %s"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:718
+msgid "Unrecognized Content-Type provided in request"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:722
+msgid "No Content-Type provided in request"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:726
+msgid "Empty body provided in request"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:837
+#, python-format
+msgid "There is no such action: %s"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:840 cinder/api/openstack/wsgi.py:853
+#: cinder/api/v1/snapshot_metadata.py:55 cinder/api/v1/snapshot_metadata.py:73
+#: cinder/api/v1/snapshot_metadata.py:98 cinder/api/v1/snapshot_metadata.py:123
+#: cinder/api/v1/volume_metadata.py:55 cinder/api/v1/volume_metadata.py:73
+#: cinder/api/v1/volume_metadata.py:98 cinder/api/v1/volume_metadata.py:123
+#: cinder/api/v2/snapshot_metadata.py:55 cinder/api/v2/snapshot_metadata.py:73
+#: cinder/api/v2/snapshot_metadata.py:98 cinder/api/v2/snapshot_metadata.py:123
+msgid "Malformed request body"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:850
+msgid "Unsupported Content-Type"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:862
+msgid "Malformed request url"
+msgstr ""
+
+#: cinder/api/openstack/wsgi.py:910
+#, python-format
+msgid "%(url)s returned a fault: %(e)s"
+msgstr ""
+
+#: cinder/api/openstack/volume/__init__.py:25
+msgid ""
+"cinder.api.openstack.volume:APIRouter is deprecated. Please use "
+"cinder.api.v1.router:APIRouter instead."
+msgstr ""
+
+#: cinder/api/openstack/volume/versions.py:26
+msgid ""
+"cinder.api.openstack.volume.versions.Versions is deprecated. Please use "
+"cinder.api.versions.Versions instead."
+msgstr ""
+
+#: cinder/api/v1/limits.py:145 cinder/api/v2/limits.py:145
+#, python-format
+msgid ""
+"Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
+"%(unit_string)s."
+msgstr ""
+
+#: cinder/api/v1/limits.py:271 cinder/api/v2/limits.py:271
+msgid "This request was rate-limited."
+msgstr ""
+
+#: cinder/api/v1/snapshot_metadata.py:39 cinder/api/v1/snapshot_metadata.py:119
+#: cinder/api/v1/snapshot_metadata.py:158 cinder/api/v2/snapshot_metadata.py:39
+#: cinder/api/v2/snapshot_metadata.py:119
+#: cinder/api/v2/snapshot_metadata.py:158
+msgid "snapshot does not exist"
+msgstr ""
+
+#: cinder/api/v1/snapshot_metadata.py:141
+#: cinder/api/v1/snapshot_metadata.py:151 cinder/api/v1/volume_metadata.py:141
+#: cinder/api/v1/volume_metadata.py:151 cinder/api/v2/snapshot_metadata.py:141
+#: cinder/api/v2/snapshot_metadata.py:151
+msgid "Metadata item was not found"
+msgstr ""
+
+#: cinder/api/v1/snapshots.py:119 cinder/api/v2/snapshots.py:120
+#, python-format
+msgid "Delete snapshot with id: %s"
+msgstr ""
+
+#: cinder/api/v1/snapshots.py:173 cinder/api/v2/snapshots.py:184
+#, python-format
+msgid "Create snapshot from volume %s"
+msgstr ""
+
+#: cinder/api/v1/snapshots.py:177 cinder/api/v2/snapshots.py:193
+#, python-format
+msgid "Invalid value '%s' for force. "
+msgstr ""
+
+#: cinder/api/v1/volume_metadata.py:39 cinder/api/v1/volume_metadata.py:119
+#: cinder/api/v1/volume_metadata.py:158
+msgid "volume does not exist"
+msgstr ""
+
+#: cinder/api/v1/volumes.py:105
+#, python-format
+msgid "vol=%s"
+msgstr ""
+
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
+#, python-format
+msgid "Delete volume with id: %s"
+msgstr ""
+
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
+#, python-format
+msgid "Create volume of %s GB"
+msgstr ""
+
+#: cinder/api/v1/volumes.py:482
+#, python-format
+msgid "Removing options '%(bad_options)s' from query"
+msgstr ""
+
+#: cinder/api/v2/snapshots.py:111 cinder/api/v2/snapshots.py:126
+#: cinder/api/v2/snapshots.py:257
+msgid "Snapshot could not be found"
+msgstr ""
+
+#: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
+#, python-format
+msgid "Missing required element '%s' in request body"
+msgstr ""
+
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
+msgid "Missing request body"
+msgstr ""
+
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
+msgid "Volume type not found"
+msgstr ""
+
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
+msgid "Volume could not be found"
+msgstr ""
+
+#: cinder/api/v2/volumes.py:236
+msgid "Volume cannot be deleted while in attached state"
+msgstr ""
+
+#: cinder/api/v2/volumes.py:458
+#, python-format
+msgid "Removing options '%s' from query"
+msgstr ""
+
+#: cinder/backup/api.py:66
+msgid "Backup status must be available or error"
+msgstr ""
+
+#: cinder/backup/api.py:105
+msgid "Volume to be backed up must be available"
+msgstr ""
+
+#: cinder/backup/api.py:141
+msgid "Backup status must be available"
+msgstr ""
+
+#: cinder/backup/api.py:146
+msgid "Backup to be restored has invalid size"
+msgstr ""
+
+#: cinder/backup/api.py:155
+#, python-format
+msgid "Creating volume of %(size)s GB for restore of backup %(backup_id)s"
+msgstr ""
+
+#: cinder/backup/api.py:171
+#, python-format
+msgid ""
+"volume size %(volume_size)d is too small to restore backup of size "
+"%(size)d."
+msgstr ""
+
+#: cinder/backup/api.py:177
+msgid "Volume to be restored to must be available"
+msgstr ""
+
+#: cinder/backup/api.py:183
+msgid "Volume to be restored to is smaller than the backup to be restored"
+msgstr ""
+
+#: cinder/backup/api.py:187
+#, python-format
+msgid "Overwriting volume %(volume_id)s with restore of backup %(backup_id)s"
+msgstr ""
+
+#: cinder/backup/manager.py:101
+msgid "Cleaning up incomplete backup operations"
+msgstr ""
+
+#: cinder/backup/manager.py:105
+#, python-format
+msgid "Resetting volume %s to available (was backing-up)"
+msgstr ""
+
+#: cinder/backup/manager.py:109
+#, python-format
+msgid "Resetting volume %s to error_restoring (was restoring-backup)"
+msgstr ""
+
+#: cinder/backup/manager.py:120
+#, python-format
+msgid "Resetting backup %s to error (was creating)"
+msgstr ""
+
+#: cinder/backup/manager.py:126
+#, python-format
+msgid "Resetting backup %s to available (was restoring)"
+msgstr ""
+
+#: cinder/backup/manager.py:131
+#, python-format
+msgid "Resuming delete on backup: %s"
+msgstr ""
+
+#: cinder/backup/manager.py:139
+#, python-format
+msgid "create_backup started, backup: %(backup_id)s for volume: %(volume_id)s"
+msgstr ""
+
+#: cinder/backup/manager.py:149
+#, python-format
+msgid ""
+"create_backup aborted, expected volume status %(expected_status)s but got"
+" %(actual_status)s"
+msgstr ""
+
+#: cinder/backup/manager.py:161
+#, python-format
+msgid ""
+"create_backup aborted, expected backup status %(expected_status)s but got"
+" %(actual_status)s"
+msgstr ""
+
+#: cinder/backup/manager.py:187
+#, python-format
+msgid "create_backup finished. backup: %s"
+msgstr ""
+
+#: cinder/backup/manager.py:191
+#, python-format
+msgid ""
+"restore_backup started, restoring backup: %(backup_id)s to volume: "
+"%(volume_id)s"
+msgstr ""
+
+#: cinder/backup/manager.py:201
+#, python-format
+msgid ""
+"restore_backup aborted, expected volume status %(expected_status)s but "
+"got %(actual_status)s"
+msgstr ""
+
+#: cinder/backup/manager.py:212
+#, python-format
+msgid ""
+"restore_backup aborted, expected backup status %(expected_status)s but "
+"got %(actual_status)s"
+msgstr ""
+
+#: cinder/backup/manager.py:231
+#, python-format
+msgid ""
+"restore_backup aborted, the backup service currently configured "
+"[%(configured_service)s] is not the backup service that was used to "
+"create this backup [%(backup_service)s]"
+msgstr ""
+
+#: cinder/backup/manager.py:255
+#, python-format
+msgid ""
+"restore_backup finished, backup: %(backup_id)s restored to volume: "
+"%(volume_id)s"
+msgstr ""
+
+#: cinder/backup/manager.py:262
+#, python-format
+msgid "delete_backup started, backup: %s"
+msgstr ""
+
+#: cinder/backup/manager.py:268
+#, python-format
+msgid ""
+"delete_backup aborted, expected backup status %(expected_status)s but got"
+" %(actual_status)s"
+msgstr ""
+
+#: cinder/backup/manager.py:281
+#, python-format
+msgid ""
+"delete_backup aborted, the backup service currently configured "
+"[%(configured_service)s] is not the backup service that was used to "
+"create this backup [%(backup_service)s]"
+msgstr ""
+
+#: cinder/backup/manager.py:304
+#, python-format
+msgid "delete_backup finished, backup %s deleted"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:112
+msgid ""
+"rbd striping not supported - ignoring configuration settings for rbd "
+"striping"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:143
+#, python-format
+msgid "invalid user '%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:209
+msgid "backup_id required"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:215
+#, python-format
+msgid "transferring data between '%(src)s' and '%(dest)s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:219
+#, python-format
+msgid "%(chunks)s chunks of %(bytes)s bytes to be transferred"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:229
+#, python-format
+msgid "transferred chunk %(chunk)s of %(chunks)s (%(rate)dK/s)"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:239
+#, python-format
+msgid "transferring remaining %s bytes"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:251
+#, python-format
+msgid "creating base image '%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:278 cinder/backup/drivers/ceph.py:534
+#, python-format
+msgid "deleting backup snapshot='%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:281
+msgid "no backup snapshot to delete"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:317
+#, python-format
+msgid "trying diff format name format basename='%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:325
+#, python-format
+msgid "image %s not found"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:333
+#, python-format
+msgid "base image still has %s snapshots so skipping base image delete"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:338
+#, python-format
+msgid "deleting base image='%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:345
+#, python-format
+msgid "image busy, retrying %(retries)s more time(s) in %(delay)ss"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:350
+msgid "max retries reached - raising error"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:353
+#, python-format
+msgid "base backup image='%s' deleted)"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:363
+#, python-format
+msgid "deleting source snap '%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:379
+#, python-format
+msgid "performing differential transfer from '%(src)s' to '%(dest)s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:402
+#, python-format
+msgid "rbd export-diff failed - %s"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:411
+#, python-format
+msgid "rbd import-diff failed - %s"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:419
+#, python-format
+msgid "image '%s' not found - trying diff format name"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:424
+#, python-format
+msgid "diff format image '%s' not found"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:459
+#, python-format
+msgid "using --from-snap '%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:486
+#, python-format
+msgid ""
+"snap='%(snap)s' does not exist in base image='%(base)s' - aborting "
+"incremental backup"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:497
+#, python-format
+msgid "creating backup snapshot='%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:517
+#, python-format
+msgid "differential backup transfer completed in %.4fs"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:526
+msgid "differential backup transfer failed"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:556
+#, python-format
+msgid "creating base image='%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:565
+msgid "copying data"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:625
+#, python-format
+msgid "looking for snapshot of backup base '%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:628
+#, python-format
+msgid "backup base '%s' has no snapshots"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:635
+#, python-format
+msgid "backup '%s' has no snapshot"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:639
+#, python-format
+msgid "backup should only have one snapshot but instead has %s"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:644
+#, python-format
+msgid "found snapshot '%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:681
+#, python-format
+msgid "Starting backup of volume='%s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:694
+msgid "forcing full backup"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:706
+#, python-format
+msgid "backup '%s' finished."
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:744
+#, python-format
+msgid "trying incremental restore from base='%(base)s' snap='%(snap)s'"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:756
+msgid "differential restore failed, trying full restore"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:760
+#, python-format
+msgid "restore transfer completed in %.4fs"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:854
+#, python-format
+msgid "no restore point found for backup='%s', forcing full copy"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:880
+msgid "forcing full restore"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:893
+#, python-format
+msgid "starting restore from Ceph backup=%(src)s to volume=%(dest)s"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:907
+msgid "volume_file does not support fileno() so skipping fsync()"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:912
+msgid "restore finished."
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:914
+#, python-format
+msgid "restore finished with error - %s"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:920
+#, python-format
+msgid "delete started for backup=%s"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:925
+msgid "rbd image not found but continuing anyway so that db entry can be removed"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:928
+#, python-format
+msgid "delete '%s' finished with warning"
+msgstr ""
+
+#: cinder/backup/drivers/ceph.py:930
+#, python-format
+msgid "delete '%s' finished"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:105
+#, python-format
+msgid "unsupported compression algorithm: %s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:122
+#, python-format
+msgid "single_user auth mode enabled, but %(param)s not set"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:140
+#, python-format
+msgid "_check_container_exists: container: %s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:145
+#, python-format
+msgid "container %s does not exist"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:150
+#, python-format
+msgid "container %s exists"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:156
+#, python-format
+msgid "_create_container started, container: %(container)s,backup: %(backup_id)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:172
+#, python-format
+msgid "_generate_swift_object_name_prefix: %s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:181
+#, python-format
+msgid "generated object list: %s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:191
+#, python-format
+msgid ""
+"_write_metadata started, container name: %(container)s, metadata "
+"filename: %(filename)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:208
+#, python-format
+msgid ""
+"error writing metadata file to swift, MD5 of metadata file in swift "
+"[%(etag)s] is not the same as MD5 of metadata file sent to swift "
+"[%(md5)s]"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:213
+msgid "_write_metadata finished"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:218
+#, python-format
+msgid ""
+"_read_metadata started, container name: %(container)s, metadata filename:"
+" %(filename)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:223
+#, python-format
+msgid "_read_metadata finished (%s)"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:233
+#, python-format
+msgid "volume size %d is invalid."
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:247
+#, python-format
+msgid ""
+"starting backup of volume: %(volume_id)s to swift, volume size: "
+"%(volume_size_bytes)d, swift object names prefix %(object_prefix)s, "
+"availability zone: %(availability_zone)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:270
+msgid "reading chunk of data from volume"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:277
+#, python-format
+msgid ""
+"compressed %(data_size_bytes)d bytes of data to %(comp_size_bytes)d bytes"
+" using %(algorithm)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:286
+msgid "not compressing data"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:290
+msgid "About to put_object"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:296
+#, python-format
+msgid "swift MD5 for %(object_name)s: %(etag)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:300
+#, python-format
+msgid "backup MD5 for %(object_name)s: %(md5)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:303
+#, python-format
+msgid ""
+"error writing object to swift, MD5 of object in swift %(etag)s is not the"
+" same as MD5 of object sent to swift %(md5)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:311
+msgid "Calling eventlet.sleep(0)"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:327 cinder/backup/drivers/tsm.py:324
+#, python-format
+msgid "backup %s finished."
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:344
+#, python-format
+msgid "v1 swift volume backup restore of %s started"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:349
+#, python-format
+msgid "metadata_object_names = %s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:355
+msgid ""
+"restore_backup aborted, actual swift object list in swift does not match "
+"object list stored in metadata"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:361
+#, python-format
+msgid ""
+"restoring object from swift. backup: %(backup_id)s, container: "
+"%(container)s, swift object name: %(object_name)s, volume: %(volume_id)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:377
+#, python-format
+msgid "decompressing data using %s algorithm"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:400
+#, python-format
+msgid "v1 swift volume backup restore of %s finished"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:408
+#, python-format
+msgid ""
+"starting restore of backup %(object_prefix)s from swift container: "
+"%(container)s, to volume %(volume_id)s, backup: %(backup_id)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:422
+#, python-format
+msgid "Restoring swift backup version %s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:427
+#, python-format
+msgid "No support to restore swift backup version %s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:431 cinder/backup/drivers/tsm.py:378
+#, python-format
+msgid "restore %(backup_id)s to %(volume_id)s finished."
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:445
+msgid "swift error while listing objects, continuing with delete"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:454
+#, python-format
+msgid "swift error while deleting object %s, continuing with delete"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:457
+#, python-format
+msgid "deleted swift object: %(swift_object_name)s in container: %(container)s"
+msgstr ""
+
+#: cinder/backup/drivers/swift.py:467 cinder/backup/drivers/tsm.py:440
+#, python-format
+msgid "delete %s finished"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:85
+#, python-format
+msgid ""
+"backup: %(vol_id)s Failed to create device hardlink from %(vpath)s to "
+"%(bpath)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:143
+#, python-format
+msgid ""
+"backup: %(vol_id)s Failed to obtain backup success notification from "
+"server.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:173
+#, python-format
+msgid ""
+"restore: %(vol_id)s Failed.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:199
+#, python-format
+msgid "backup: %(vol_id)s Failed. %(path)s is not a block device."
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:206
+#, python-format
+msgid "backup: %(vol_id)s Failed. Cannot obtain real path to device %(path)s."
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:213
+#, python-format
+msgid "backup: %(vol_id)s Failed. %(path)s is not a file."
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:260
+#, python-format
+msgid ""
+"backup: %(vol_id)s Failed to remove backup hardlink from %(vpath)s to "
+"%(bpath)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:286
+#, python-format
+msgid ""
+"starting backup of volume: %(volume_id)s to TSM, volume path: "
+"%(volume_path)s,"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:298
+#, python-format
+msgid ""
+"backup: %(vol_id)s Failed to run dsmc on %(bpath)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:308
+#, python-format
+msgid ""
+"backup: %(vol_id)s Failed to run dsmc due to invalid arguments on "
+"%(bpath)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:338
+#, python-format
+msgid ""
+"restore: starting restore of backup from TSM to volume %(volume_id)s,  "
+"backup: %(backup_id)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:352
+#, python-format
+msgid ""
+"restore: %(vol_id)s Failed to run dsmc on %(bpath)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:362
+#, python-format
+msgid ""
+"restore: %(vol_id)s Failed to run dsmc due to invalid arguments on "
+"%(bpath)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:413
+#, python-format
+msgid ""
+"delete: %(vol_id)s Failed to run dsmc with stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:421
+#, python-format
+msgid ""
+"restore: %(vol_id)s Failed to run dsmc due to invalid arguments with "
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/backup/drivers/tsm.py:432
+#, python-format
+msgid ""
+"delete: %(vol_id)s Failed with stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/brick/exception.py:92
+msgid "We are unable to locate any Fibre Channel devices."
+msgstr ""
+
+#: cinder/brick/exception.py:96
+msgid "Unable to find a Fibre Channel volume device."
+msgstr ""
+
+#: cinder/brick/exception.py:100
+#, python-format
+msgid "Volume device not found at %(device)s."
+msgstr ""
+
+#: cinder/brick/exception.py:104
+#, python-format
+msgid "Failed to create iser target for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/brick/exception.py:108
+#, python-format
+msgid "Failed to remove iser target for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/brick/exception.py:112
+#, python-format
+msgid "Unable to find Volume Group: %(vg_name)s"
+msgstr ""
+
+#: cinder/brick/exception.py:116
+#, python-format
+msgid "Failed to create Volume Group: %(vg_name)s"
+msgstr ""
+
+#: cinder/brick/exception.py:120
+#, python-format
+msgid "Failed to create iscsi target for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/brick/exception.py:124
+#, python-format
+msgid "Failed to remove iscsi target for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/brick/exception.py:128
+#, python-format
+msgid "Failed to attach iSCSI target for volume %(volume_id)s."
+msgstr ""
+
+#: cinder/brick/exception.py:132
+#, python-format
+msgid "Connect to volume via protocol %(protocol)s not supported."
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:119
+#, python-format
+msgid "Invalid InitiatorConnector protocol specified %(protocol)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:132
+#, python-format
+msgid "Failed to access the device on the path %(path)s: %(error)s %(info)s."
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:216
+#, python-format
+msgid ""
+"ISCSI volume not yet found at: %(host_device)s. Will rescan & retry.  Try"
+" number: %(tries)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:229
+#, python-format
+msgid "Found iSCSI node %(host_device)s (after %(tries)s rescans)"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:296
+#, python-format
+msgid "Could not find the iSCSI Initiator File %s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:553
+msgid "We are unable to locate any Fibre Channel devices"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:563
+#, python-format
+msgid "Looking for Fibre Channel dev %(device)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:573
+msgid "Fibre Channel volume device not found."
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:577
+#, python-format
+msgid "Fibre volume not yet found. Will rescan & retry.  Try number: %(tries)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:593
+#, python-format
+msgid "Found Fibre Channel volume %(name)s (after %(tries)s rescans)"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:602
+#, python-format
+msgid "Multipath device discovered %(device)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:715
+#, python-format
+msgid "AoE volume not yet found at: %(path)s. Try number: %(tries)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:728
+#, python-format
+msgid "Found AoE device %(path)s (after %(tries)s rediscover)"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:754
+#, python-format
+msgid "aoe-discover: stdout=%(out)s stderr%(err)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:764
+#, python-format
+msgid "aoe-revalidate %(dev)s: stdout=%(out)s stderr%(err)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:773
+#, python-format
+msgid "aoe-flush %(dev)s: stdout=%(out)s stderr%(err)s"
+msgstr ""
+
+#: cinder/brick/initiator/connector.py:836
+msgid "Invalid connection_properties specified no device_path attribute"
+msgstr ""
+
+#: cinder/brick/initiator/linuxfc.py:52 cinder/brick/initiator/linuxfc.py:58
+msgid "systool is not installed"
+msgstr ""
+
+#: cinder/brick/initiator/linuxscsi.py:101
+#: cinder/brick/initiator/linuxscsi.py:109
+#: cinder/brick/initiator/linuxscsi.py:126
+#, python-format
+msgid "multipath call failed exit (%(code)s)"
+msgstr ""
+
+#: cinder/brick/initiator/linuxscsi.py:147
+#, python-format
+msgid "Couldn't find multipath device %(line)s"
+msgstr ""
+
+#: cinder/brick/initiator/linuxscsi.py:151
+#, python-format
+msgid "Found multipath device = %(mdev)s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:152
+#, python-format
+msgid "Creating iscsi_target for: %s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:171 cinder/brick/iscsi/iscsi.py:293
+#, python-format
+msgid "Failed to create iscsi target for volume id:%(vol_id)s: %(e)s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:182
+#, python-format
+msgid ""
+"Failed to create iscsi target for volume id:%(vol_id)s. Please ensure "
+"your tgtd config file contains 'include %(volumes_dir)s/*'"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:196
+#, python-format
+msgid "Removing iscsi_target for: %s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:213
+#, python-format
+msgid "Failed to remove iscsi target for volume id:%(vol_id)s: %(e)s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:223 cinder/brick/iscsi/iscsi.py:464
+#: cinder/brick/iser/iser.py:202
+msgid "valid iqn needed for show_target"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:300
+#, python-format
+msgid "Removing iscsi_target for volume: %s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:386
+msgid "rtstool is not installed correctly"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:406
+#, python-format
+msgid "Creating iscsi_target for volume: %s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:430 cinder/brick/iscsi/iscsi.py:439
+#, python-format
+msgid "Failed to create iscsi target for volume id:%s."
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:446
+#, python-format
+msgid "Removing iscsi_target: %s"
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:456
+#, python-format
+msgid "Failed to remove iscsi target for volume id:%s."
+msgstr ""
+
+#: cinder/brick/iscsi/iscsi.py:485
+#, python-format
+msgid "Failed to add initiator iqn %s to target"
+msgstr ""
+
+#: cinder/brick/iser/iser.py:133
+#, python-format
+msgid "Creating iser_target for: %s"
+msgstr ""
+
+#: cinder/brick/iser/iser.py:152
+#, python-format
+msgid "Failed to create iser target for volume id:%(vol_id)s: %(e)s"
+msgstr ""
+
+#: cinder/brick/iser/iser.py:163
+#, python-format
+msgid ""
+"Failed to create iser target for volume id:%(vol_id)s. Please ensure your"
+" tgtd config file contains 'include %(volumes_dir)s/*'"
+msgstr ""
+
+#: cinder/brick/iser/iser.py:175
+#, python-format
+msgid "Removing iser_target for: %s"
+msgstr ""
+
+#: cinder/brick/iser/iser.py:192
+#, python-format
+msgid "Failed to remove iser target for volume id:%(vol_id)s: %(e)s"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:74
+msgid "Error creating Volume Group"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:75 cinder/brick/local_dev/lvm.py:371
+#: cinder/brick/local_dev/lvm.py:400
+#, python-format
+msgid "Cmd     :%s"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:76 cinder/brick/local_dev/lvm.py:372
+#: cinder/brick/local_dev/lvm.py:401
+#, python-format
+msgid "StdOut  :%s"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:77 cinder/brick/local_dev/lvm.py:373
+#: cinder/brick/local_dev/lvm.py:402
+#, python-format
+msgid "StdErr  :%s"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:81
+#, python-format
+msgid "Unable to locate Volume Group %s"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:291
+#, python-format
+msgid "Unable to find VG: %s"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:317
+msgid ""
+"Requested to setup thin provisioning, however current LVM version does "
+"not support it."
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:370
+msgid "Error creating Volume"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:386
+#, python-format
+msgid "Unable to find LV: %s"
+msgstr ""
+
+#: cinder/brick/local_dev/lvm.py:399
+msgid "Error creating snapshot"
+msgstr ""
+
+#: cinder/brick/remotefs/remotefs.py:99
+#, python-format
+msgid "Already mounted: %s"
+msgstr ""
+
+#: cinder/common/config.py:132
+msgid "Deploy v1 of the Cinder API. "
+msgstr ""
+
+#: cinder/common/config.py:135
+msgid "Deploy v2 of the Cinder API. "
+msgstr ""
+
+#: cinder/common/sqlalchemyutils.py:68
+#: cinder/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: cinder/common/sqlalchemyutils.py:116
+#: cinder/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
+#: cinder/compute/nova.py:101
+#, python-format
+msgid "Novaclient connection created using URL: %s"
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:66
+msgid "Use of empty request context is deprecated"
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:193
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:894
+#, python-format
+msgid "Change will make usage less than 0 for the following resources: %s"
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:1896
+#, python-format
+msgid "VolumeType %s deletion failed, VolumeType in use."
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:2568
+#, python-format
+msgid "No backup with id %s"
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:2654
+msgid "Volume must be available"
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:2678
+#, python-format
+msgid "Volume in unexpected state %s, expected awaiting-transfer"
+msgstr ""
+
+#: cinder/db/sqlalchemy/api.py:2701
+#, python-format
+msgid ""
+"Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
+"%(status)s, expected awaiting-transfer"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migration.py:72
+msgid "version should be an integer"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migration.py:99
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:242
+msgid "Exception while creating table."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/001_cinder_init.py:271
+msgid "Downgrade from initial Cinder install is unsupported."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:50
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:75
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:106
+#: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:58
+#: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:47
+#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:49
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:83
+#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:47
+#, python-format
+msgid "Table |%s| not created!"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:118
+msgid "quota_classes table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:125
+msgid "quota_usages table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:132
+msgid "reservations table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:62
+msgid "Exception while creating table 'volume_glance_metadata'"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/003_glance_metadata.py:77
+msgid "volume_glance_metadata table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py:70
+msgid "backups table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/009_add_snapshot_metadata_table.py:60
+msgid "snapshot_metadata table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/010_add_transfers_table.py:62
+msgid "transfers table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:33
+msgid "migrations table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/015_drop_migrations_table.py:62
+#, python-format
+msgid "Table |%s| not created"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:39
+#, python-format
+msgid "Exception while dropping table %s."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/016_drop_sm_tables.py:99
+#, python-format
+msgid "Exception while creating table %s."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:38
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:47
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:53
+#, python-format
+msgid "Column |%s| not created!"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:95
+msgid "encryption_key_id column not dropped from volumes"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:103
+msgid "encryption_key_id column not dropped from snapshots"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:108
+msgid "volume_type_id column not dropped from snapshots"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py:116
+msgid "encryption table not dropped"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:49
+msgid "Table quality_of_service_specs not created!"
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:60
+msgid "Added qos_specs_id column to volume type table failed."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:75
+msgid "Dropping quality_of_service_specs table failed."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py:83
+msgid "Dropping qos_specs_id column failed."
+msgstr ""
+
+#: cinder/db/sqlalchemy/migrate_repo/versions/020_add_volume_admin_metadata_table.py:60
+msgid "volume_admin_metadata table not dropped"
+msgstr ""
+
+#: cinder/image/glance.py:163 cinder/image/glance.py:171
+#, python-format
+msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
+msgstr ""
+
+#: cinder/image/image_utils.py:121
+msgid "Snapshot list encountered but no header found!"
+msgstr ""
+
+#: cinder/image/image_utils.py:226 cinder/image/image_utils.py:311
+msgid "'qemu-img info' parsing failed."
+msgstr ""
+
+#: cinder/image/image_utils.py:233
+#, python-format
+msgid "fmt=%(fmt)s backed by: %(backing_file)s"
+msgstr ""
+
+#: cinder/image/image_utils.py:280
+#, python-format
+msgid ""
+"qemu-img is not installed and image is of type %s.  Only RAW images can "
+"be used if qemu-img is not installed."
+msgstr ""
+
+#: cinder/image/image_utils.py:287
+msgid ""
+"qemu-img is not installed and the disk format is not specified.  Only RAW"
+" images can be used if qemu-img is not installed."
+msgstr ""
+
+#: cinder/image/image_utils.py:301
+#, python-format
+msgid "Copying image from %(tmp)s to volume %(dest)s - size: %(size)s"
+msgstr ""
+
+#: cinder/image/image_utils.py:318
+#, python-format
+msgid "fmt=%(fmt)s backed by:%(backing_file)s"
+msgstr ""
+
+#: cinder/image/image_utils.py:339
+#, python-format
+msgid "Converted to %(vol_format)s, but format is now %(file_format)s"
+msgstr ""
+
+#: cinder/image/image_utils.py:374
+#, python-format
+msgid "Converted to %(f1)s, but format is now %(f2)s"
+msgstr ""
+
+#: cinder/openstack/common/excutils.py:48
+#, python-format
+msgid "Original exception being dropped: %s"
+msgstr ""
+
+#: cinder/openstack/common/fileutils.py:64
+#, python-format
+msgid "Reloading cached file %s"
+msgstr ""
+
+#: cinder/openstack/common/lockutils.py:102
+#, python-format
+msgid "Could not release the acquired lock `%s`"
+msgstr ""
+
+#: cinder/openstack/common/lockutils.py:189
+#, python-format
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: cinder/openstack/common/lockutils.py:200
+#, python-format
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
+msgstr ""
+
+#: cinder/openstack/common/lockutils.py:227
+#, python-format
+msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: cinder/openstack/common/lockutils.py:235
+#, python-format
+msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
+msgstr ""
+
+#: cinder/openstack/common/log.py:244
+#, python-format
+msgid "Deprecated: %s"
+msgstr ""
+
+#: cinder/openstack/common/log.py:336
+#, python-format
+msgid "Error loading logging config %(log_config)s: %(err_msg)s"
+msgstr ""
+
+#: cinder/openstack/common/log.py:386
+#, python-format
+msgid "syslog facility must be one of: %s"
+msgstr ""
+
+#: cinder/openstack/common/log.py:556
+#, python-format
+msgid "Fatal call to deprecated config: %(msg)s"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:84
+#, python-format
+msgid "task run outlasted interval by %s sec"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:91
+#: cinder/tests/brick/test_brick_connector.py:451
+msgid "in fixed duration looping call"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:131
+#, python-format
+msgid "Dynamic looping call sleeping for %.02f seconds"
+msgstr ""
+
+#: cinder/openstack/common/loopingcall.py:138
+msgid "in dynamic looping call"
+msgstr ""
+
+#: cinder/openstack/common/periodic_task.py:42
+#, python-format
+msgid "Unexpected argument for periodic task creation: %(arg)s."
+msgstr ""
+
+#: cinder/openstack/common/periodic_task.py:133
+#, python-format
+msgid "Skipping periodic task %(task)s because its interval is negative"
+msgstr ""
+
+#: cinder/openstack/common/periodic_task.py:138
+#, python-format
+msgid "Skipping periodic task %(task)s because it is disabled"
+msgstr ""
+
+#: cinder/openstack/common/periodic_task.py:176
+#, python-format
+msgid "Running periodic task %(full_task_name)s"
+msgstr ""
+
+#: cinder/openstack/common/periodic_task.py:184
+#, python-format
+msgid "Error during %(full_task_name)s: %(e)s"
+msgstr ""
+
+#: cinder/openstack/common/policy.py:149
+#, python-format
+msgid ""
+"Inheritance-based rules are deprecated; use the default brain instead of "
+"%s."
+msgstr ""
+
+#: cinder/openstack/common/policy.py:163
+#, python-format
+msgid "Failed to understand rule %(match)r"
+msgstr ""
+
+#: cinder/openstack/common/policy.py:173
+#, python-format
+msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgstr ""
+
+#: cinder/openstack/common/policy.py:180
+#, python-format
+msgid "No handler for matches of kind %s"
+msgstr ""
+
+#: cinder/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: cinder/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: cinder/openstack/common/processutils.py:167
+#: cinder/openstack/common/processutils.py:239
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:341
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: cinder/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: cinder/openstack/common/processutils.py:218
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:314
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
+#: cinder/openstack/common/processutils.py:220
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: cinder/openstack/common/processutils.py:224
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: cinder/openstack/common/service.py:262
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:86
+#, python-format
+msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:182
+#, python-format
+msgid "Invalid string format: %s"
+msgstr ""
+
+#: cinder/openstack/common/strutils.py:189
+#, python-format
+msgid "Unknown byte multiplier: %s"
+msgstr ""
+
+#: cinder/openstack/common/db/exception.py:44
+msgid "Invalid Parameter: Unicode is not supported by the current database."
+msgstr ""
+
+#: cinder/openstack/common/db/sqlalchemy/session.py:487
+msgid "DB exception wrapped."
+msgstr ""
+
+#: cinder/openstack/common/db/sqlalchemy/session.py:538
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: cinder/openstack/common/db/sqlalchemy/session.py:610
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: cinder/openstack/common/db/sqlalchemy/utils.py:33
+msgid "Sort key supplied was not valid."
+msgstr ""
+
+#: cinder/openstack/common/notifier/api.py:129
+#, python-format
+msgid "%s not in valid priorities"
+msgstr ""
+
+#: cinder/openstack/common/notifier/api.py:145
+#, python-format
+msgid ""
+"Problem '%(e)s' attempting to send to notification system. "
+"Payload=%(payload)s"
+msgstr ""
+
+#: cinder/openstack/common/notifier/api.py:164
+#, python-format
+msgid "Failed to load notifier %s. These notifications will not be sent."
+msgstr ""
+
+#: cinder/openstack/common/notifier/rabbit_notifier.py:27
+msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
+msgstr ""
+
+#: cinder/openstack/common/notifier/rpc_notifier.py:45
+#: cinder/openstack/common/notifier/rpc_notifier2.py:51
+#, python-format
+msgid "Could not send notification to %(topic)s. Payload=%(message)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/__init__.py:106
+#, python-format
+msgid ""
+"A RPC is being made while holding a lock. The locks currently held are "
+"%(locks)s. This is probably a bug. Please report it. Include the "
+"following: [%(stack)s]."
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:83
+msgid "Pool creating new connection"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:208
+#, python-format
+msgid "no calling threads waiting for msg_id : %s, message : %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:216
+#, python-format
+msgid ""
+"Number of call waiters is greater than warning threshhold: %d. There "
+"could be a MulticallProxyWaiter leak."
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:299
+#, python-format
+msgid "unpacked context: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:345
+#, python-format
+msgid "UNIQUE_ID is %s."
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:414
+#, python-format
+msgid "received %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:422
+#, python-format
+msgid "no method for message: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:423
+#, python-format
+msgid "No method for message: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:451
+#: cinder/openstack/common/rpc/impl_zmq.py:280
+#, python-format
+msgid "Expected exception during message handling (%s)"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:459
+#: cinder/openstack/common/rpc/impl_zmq.py:286
+msgid "Exception during message handling"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:594
+#, python-format
+msgid "Making synchronous call on %s ..."
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:597
+#, python-format
+msgid "MSG_ID is %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:631
+#, python-format
+msgid "Making asynchronous cast on %s..."
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:640
+msgid "Making asynchronous fanout cast..."
+msgstr ""
+
+#: cinder/openstack/common/rpc/amqp.py:668
+#, python-format
+msgid "Sending %(event_type)s on %(topic)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:74
+msgid "An unknown RPC related exception occurred."
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:104
+#, python-format
+msgid ""
+"Remote error: %(exc_type)s %(value)s\n"
+"%(traceback)s."
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:121
+#, python-format
+msgid ""
+"Timeout while waiting on RPC response - topic: \"%(topic)s\", RPC method:"
+" \"%(method)s\" info: \"%(info)s\""
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:137
+#: cinder/openstack/common/rpc/common.py:138
+#: cinder/openstack/common/rpc/common.py:139
+msgid "<unknown>"
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:143
+#, python-format
+msgid "Found duplicate message(%(msg_id)s). Skipping it."
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:147
+msgid "Invalid reuse of an RPC connection."
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:151
+#, python-format
+msgid "Specified RPC version, %(version)s, not supported by this endpoint."
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:156
+#, python-format
+msgid ""
+"Specified RPC envelope version, %(version)s, not supported by this "
+"endpoint."
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:280
+#, python-format
+msgid "Failed to sanitize %(item)s. Key error %(err)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/common.py:302
+#, python-format
+msgid "Returning exception %s to caller"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:166
+#: cinder/openstack/common/rpc/impl_qpid.py:163
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:477
+#, python-format
+msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:499
+#, python-format
+msgid "Connected to AMQP server on %(hostname)s:%(port)d"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:536
+#, python-format
+msgid ""
+"Unable to connect to AMQP server on %(hostname)s:%(port)d after "
+"%(max_retries)d tries: %(err_str)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:552
+#, python-format
+msgid ""
+"AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
+"again in %(sleep_time)d seconds."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:606
+#: cinder/openstack/common/rpc/impl_qpid.py:506
+#, python-format
+msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:624
+#: cinder/openstack/common/rpc/impl_qpid.py:521
+#, python-format
+msgid "Timed out waiting for RPC response: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:628
+#: cinder/openstack/common/rpc/impl_qpid.py:525
+#, python-format
+msgid "Failed to consume message from queue: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_kombu.py:667
+#: cinder/openstack/common/rpc/impl_qpid.py:560
+#, python-format
+msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_qpid.py:85
+#, python-format
+msgid "Invalid value for qpid_topology_version: %d"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_qpid.py:454
+#, python-format
+msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_qpid.py:460
+#, python-format
+msgid "Connected to AMQP server on %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_qpid.py:473
+msgid "Re-established AMQP queues"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_qpid.py:533
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:96
+msgid "JSON serialization failed."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:101
+#, python-format
+msgid "Deserializing: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:136
+#, python-format
+msgid "Connecting to %(addr)s with %(type)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:137
+#, python-format
+msgid "-> Subscribed to %(subscribe)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:138
+#, python-format
+msgid "-> bind: %(bind)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:146
+msgid "Could not open socket."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:158
+#, python-format
+msgid "Subscribing to %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:200
+msgid "You cannot recv on this socket."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:205
+msgid "You cannot send on this socket."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:267
+#, python-format
+msgid "Running func with context: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:305
+msgid "Sending reply"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:339
+msgid "RPC message did not include method."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:371
+msgid "Registering reactor"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:383
+msgid "In reactor registered"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:387
+msgid "Consuming socket"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:437
+#, python-format
+msgid "Creating proxy for topic: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:443
+msgid "Topic contained dangerous characters."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:475
+msgid "Topic socket file creation failed."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:481
+#, python-format
+msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:497
+#, python-format
+msgid "Required IPC directory does not exist at %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:506
+#, python-format
+msgid "Permission denied to IPC directory at %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:509
+msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:543
+#, python-format
+msgid "CONSUMER RECEIVED DATA: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:562
+msgid "ZMQ Envelope version unsupported or unknown."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:590
+msgid "Skipping topic registration. Already registered."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:597
+#, python-format
+msgid "Consumer is a zmq.%s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:649
+msgid "Creating payload"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:662
+msgid "Creating queue socket for reply waiter"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:675
+msgid "Sending cast"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:678
+msgid "Cast sent; Waiting reply"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:681
+#, python-format
+msgid "Received message: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:682
+msgid "Unpacking response"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:691
+msgid "Unsupported or unknown ZMQ envelope returned."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:698
+msgid "RPC Message Invalid."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:721
+#, python-format
+msgid "%(msg)s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:724
+#, python-format
+msgid "Sending message(s) to: %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:728
+msgid "No matchmaker results. Not casting."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:731
+msgid "No match from matchmaker."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:771
+#, python-format
+msgid "topic is %s."
+msgstr ""
+
+#: cinder/openstack/common/rpc/impl_zmq.py:815
+#, python-format
+msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
+msgstr ""
+
+#: cinder/openstack/common/rpc/matchmaker.py:53
+msgid "Match not found by MatchMaker."
+msgstr ""
+
+#: cinder/openstack/common/rpc/matchmaker.py:89
+msgid "Matchmaker does not implement registration or heartbeat."
+msgstr ""
+
+#: cinder/openstack/common/rpc/matchmaker.py:239
+#, python-format
+msgid "Matchmaker unregistered: %s, %s"
+msgstr ""
+
+#: cinder/openstack/common/rpc/matchmaker.py:250
+msgid "Register before starting heartbeat."
+msgstr ""
+
+#: cinder/openstack/common/rpc/matchmaker.py:343
+#: cinder/openstack/common/rpc/matchmaker.py:361
+#, python-format
+msgid "No key defining hosts for topic '%s', see ringfile"
+msgstr ""
+
+#: cinder/scheduler/chance.py:54 cinder/scheduler/simple.py:90
+msgid "Is the appropriate service running?"
+msgstr ""
+
+#: cinder/scheduler/chance.py:64
+msgid "Could not find another host"
+msgstr ""
+
+#: cinder/scheduler/chance.py:98 cinder/scheduler/filter_scheduler.py:99
+#, python-format
+msgid "cannot place volume %(id)s on %(host)s"
+msgstr ""
+
+#: cinder/scheduler/driver.py:89
+msgid "Must implement host_passes_filters"
+msgstr ""
+
+#: cinder/scheduler/driver.py:93
+msgid "Must implement a fallback schedule"
+msgstr ""
+
+#: cinder/scheduler/driver.py:97
+msgid "Must implement schedule_create_volume"
+msgstr ""
+
+#: cinder/scheduler/filter_scheduler.py:125
+msgid "Invalid value for 'scheduler_max_attempts', must be >=1"
+msgstr ""
+
+#: cinder/scheduler/filter_scheduler.py:143
+#, python-format
+msgid ""
+"Error scheduling %(volume_id)s from last vol-service: %(last_host)s : "
+"%(exc)s"
+msgstr ""
+
+#: cinder/scheduler/filter_scheduler.py:176
+#, python-format
+msgid "Exceeded max scheduling attempts %(max_attempts)d for volume %(volume_id)s"
+msgstr ""
+
+#: cinder/scheduler/filter_scheduler.py:228
+#, python-format
+msgid "Filtered %s"
+msgstr ""
+
+#: cinder/scheduler/filter_scheduler.py:241
+#, python-format
+msgid "Choosing %s"
+msgstr ""
+
+#: cinder/scheduler/host_manager.py:240
+#, python-format
+msgid "Ignoring %(service_name)s service update from %(host)s"
+msgstr ""
+
+#: cinder/scheduler/host_manager.py:245
+#, python-format
+msgid "Received %(service_name)s service update from %(host)s."
+msgstr ""
+
+#: cinder/scheduler/host_manager.py:270
+#, python-format
+msgid "volume service is down or disabled. (host: %s)"
+msgstr ""
+
+#: cinder/scheduler/manager.py:92
+msgid "Schedule volume flow not retrieved"
+msgstr ""
+
+#: cinder/scheduler/manager.py:96
+#, python-format
+msgid "Failed to successfully complete schedule volume using flow: %s"
+msgstr ""
+
+#: cinder/scheduler/manager.py:131
+#, python-format
+msgid "Failed to schedule_%(method)s: %(ex)s"
+msgstr ""
+
+#: cinder/scheduler/scheduler_options.py:70
+#, python-format
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgstr ""
+
+#: cinder/scheduler/scheduler_options.py:80
+#, python-format
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
+
+#: cinder/scheduler/simple.py:79
+msgid "Not enough allocatable volume gigabytes remaining"
+msgstr ""
+
+#: cinder/scheduler/filters/capacity_filter.py:37
+msgid "Free capacity not set: volume node info collection broken."
+msgstr ""
+
+#: cinder/scheduler/filters/capacity_filter.py:51
+#, python-format
+msgid ""
+"Insufficient free space for volume creation (requested / avail): "
+"%(requested)s/%(available)s"
+msgstr ""
+
+#: cinder/scheduler/filters/retry_filter.py:41
+#, python-format
+msgid "Host %(host)s %(pass_msg)s.  Previously tried hosts: %(hosts)s"
+msgstr ""
+
+#: cinder/tests/fake_driver.py:57 cinder/volume/driver.py:688
+#, python-format
+msgid "FAKE ISCSI: %s"
+msgstr ""
+
+#: cinder/tests/fake_driver.py:76 cinder/volume/driver.py:963
+#, python-format
+msgid "FAKE ISER: %s"
+msgstr ""
+
+#: cinder/tests/fake_driver.py:97
+msgid "local_path not implemented"
+msgstr ""
+
+#: cinder/tests/fake_driver.py:124 cinder/tests/fake_driver.py:129
+#, python-format
+msgid "LoggingVolumeDriver: %s"
+msgstr ""
+
+#: cinder/tests/fake_utils.py:73
+#, python-format
+msgid "Faking execution of cmd (subprocess): %s"
+msgstr ""
+
+#: cinder/tests/fake_utils.py:81
+#, python-format
+msgid "Faked command matched %s"
+msgstr ""
+
+#: cinder/tests/fake_utils.py:97
+#, python-format
+msgid "Faked command raised an exception %s"
+msgstr ""
+
+#: cinder/tests/fake_utils.py:100
+#, python-format
+msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
+msgstr ""
+
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
+#: cinder/tests/test_misc.py:59
+#, python-format
+msgid ""
+"The following migrations are missing a downgrade:\n"
+"\t%s"
+msgstr ""
+
+#: cinder/tests/test_netapp_nfs.py:357
+#, python-format
+msgid "Share %(share)s and file name %(file_name)s"
+msgstr ""
+
+#: cinder/tests/test_storwize_svc.py:252
+#, python-format
+msgid "unrecognized argument %s"
+msgstr ""
+
+#: cinder/tests/test_storwize_svc.py:1415
+#, python-format
+msgid "Run CLI command: %s"
+msgstr ""
+
+#: cinder/tests/test_storwize_svc.py:1418
+#, python-format
+msgid ""
+"CLI output:\n"
+" stdout: %(stdout)s\n"
+" stderr: %(stderr)s"
+msgstr ""
+
+#: cinder/tests/test_storwize_svc.py:1423
+#, python-format
+msgid ""
+"CLI Exception output:\n"
+" stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/tests/test_volume_types.py:62
+#, python-format
+msgid "Given data: %s"
+msgstr ""
+
+#: cinder/tests/test_volume_types.py:63
+#, python-format
+msgid "Result data: %s"
+msgstr ""
+
+#: cinder/tests/api/contrib/test_backups.py:733
+msgid "Invalid input"
+msgstr ""
+
+#: cinder/tests/integrated/test_login.py:31
+#, python-format
+msgid "volume: %s"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:34
+#, python-format
+msgid ""
+"%(message)s\n"
+"Status Code: %(_status)s\n"
+"Body: %(_body)s"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:44
+msgid "Authentication error"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:52
+msgid "Authorization error"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:60
+msgid "Item not found"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:102
+#, python-format
+msgid "Doing %(method)s on %(relative_url)s"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:105
+#, python-format
+msgid "Body: %s"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:123
+#, python-format
+msgid "%(auth_uri)s => code %(http_status)s"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:150
+#, python-format
+msgid "%(relative_uri)s => code %(http_status)s"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:161
+msgid "Unexpected status code"
+msgstr ""
+
+#: cinder/tests/integrated/api/client.py:168
+#, python-format
+msgid "Decoding JSON: %s"
+msgstr ""
+
+#: cinder/transfer/api.py:70
+msgid "Volume in unexpected state"
+msgstr ""
+
+#: cinder/transfer/api.py:104 cinder/volume/api.py:369
+#: cinder/volume/manager.py:438
+msgid "status must be available"
+msgstr ""
+
+#: cinder/transfer/api.py:121
+#, python-format
+msgid "Failed to create transfer record for %s"
+msgstr ""
+
+#: cinder/transfer/api.py:138
+#, python-format
+msgid "Attempt to transfer %s with invalid auth key."
+msgstr ""
+
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
+#, python-format
+msgid ""
+"Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
+"(%(d_consumed)dG of %(d_quota)dG already consumed)"
+msgstr ""
+
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
+#, python-format
+msgid ""
+"Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
+"volumes already consumed)"
+msgstr ""
+
+#: cinder/transfer/api.py:181
+#, python-format
+msgid "Failed to update quota donating volumetransfer id %s"
+msgstr ""
+
+#: cinder/transfer/api.py:198
+#, python-format
+msgid "Volume %s has been transferred."
+msgstr ""
+
+#: cinder/volume/api.py:143
+#, python-format
+msgid "Unable to query if %s is in the availability zone set"
+msgstr ""
+
+#: cinder/volume/api.py:168
+msgid "Create volume flow not retrieved"
+msgstr ""
+
+#: cinder/volume/api.py:171
+msgid "Failed to successfully complete create volume workflow"
+msgstr ""
+
+#: cinder/volume/api.py:183
+msgid "Expected volume result not found"
+msgstr ""
+
+#: cinder/volume/api.py:207
+msgid "Failed to update quota for deleting volume"
+msgstr ""
+
+#: cinder/volume/api.py:216
+#, python-format
+msgid "Volume status must be available or error, but current status is: %s"
+msgstr ""
+
+#: cinder/volume/api.py:226 cinder/volume/api.py:466
+msgid "Volume cannot be deleted while migrating"
+msgstr ""
+
+#: cinder/volume/api.py:231
+#, python-format
+msgid "Volume still has %d dependent snapshots"
+msgstr ""
+
+#: cinder/volume/api.py:287 cinder/volume/api.py:352
+#: cinder/volume/qos_specs.py:242 cinder/volume/volume_types.py:69
+#, python-format
+msgid "Searching by: %s"
+msgstr ""
+
+#: cinder/volume/api.py:372
+msgid "already attached"
+msgstr ""
+
+#: cinder/volume/api.py:379
+msgid "status must be in-use to detach"
+msgstr ""
+
+#: cinder/volume/api.py:390
+msgid "Volume status must be available to reserve"
+msgstr ""
+
+#: cinder/volume/api.py:470
+msgid "must be available"
+msgstr ""
+
+#: cinder/volume/api.py:492
+#, python-format
+msgid ""
+"Quota exceeded for %(s_pid)s, tried to create %(s_size)sG snapshot "
+"(%(d_consumed)dG of %(d_quota)dG already consumed)"
+msgstr ""
+
+#: cinder/volume/api.py:501
+#, python-format
+msgid ""
+"Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
+"snapshots already consumed)"
+msgstr ""
+
+#: cinder/volume/api.py:552
+msgid "Volume Snapshot status must be available or error"
+msgstr ""
+
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
+msgid "Metadata property key blank"
+msgstr ""
+
+#: cinder/volume/api.py:584
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: cinder/volume/api.py:588
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: cinder/volume/api.py:710 cinder/volume/api.py:762
+msgid "Volume status must be available/in-use."
+msgstr ""
+
+#: cinder/volume/api.py:713
+msgid "Volume status is in-use."
+msgstr ""
+
+#: cinder/volume/api.py:742
+msgid "Volume status must be available to extend."
+msgstr ""
+
+#: cinder/volume/api.py:747
+#, python-format
+msgid ""
+"New size for extend must be greater than current size. (current: "
+"%(size)s, extended: %(new_size)s)"
+msgstr ""
+
+#: cinder/volume/api.py:768
+msgid "Volume is already part of an active migration"
+msgstr ""
+
+#: cinder/volume/api.py:774
+msgid "volume must not have snapshots"
+msgstr ""
+
+#: cinder/volume/api.py:787
+#, python-format
+msgid "No available service named %s"
+msgstr ""
+
+#: cinder/volume/api.py:793
+msgid "Destination host must be different than current host"
+msgstr ""
+
+#: cinder/volume/api.py:823
+msgid "Source volume not mid-migration."
+msgstr ""
+
+#: cinder/volume/api.py:827
+msgid "Destination volume not mid-migration."
+msgstr ""
+
+#: cinder/volume/api.py:832
+#, python-format
+msgid "Destination has migration_status %(stat)s, expected %(exp)s."
+msgstr ""
+
+#: cinder/volume/api.py:843
+msgid "Volume status must be available to update readonly flag."
+msgstr ""
+
+#: cinder/volume/driver.py:155 cinder/volume/drivers/netapp/nfs.py:173
+#, python-format
+msgid "Recovering from a failed execute.  Try number %s"
+msgstr ""
+
+#: cinder/volume/driver.py:248
+#, python-format
+msgid "copy_data_between_volumes %(src)s -> %(dest)s."
+msgstr ""
+
+#: cinder/volume/driver.py:261 cinder/volume/driver.py:275
+#, python-format
+msgid "Failed to attach volume %(vol)s"
+msgstr ""
+
+#: cinder/volume/driver.py:291
+#, python-format
+msgid "Failed to copy volume %(src)s to %(dest)d"
+msgstr ""
+
+#: cinder/volume/driver.py:304
+#, python-format
+msgid "copy_image_to_volume %s."
+msgstr ""
+
+#: cinder/volume/driver.py:320
+#, python-format
+msgid "copy_volume_to_image %s."
+msgstr ""
+
+#: cinder/volume/driver.py:352 cinder/volume/driver.py:923
+#, python-format
+msgid "Unable to access the backend storage via the path %(path)s."
+msgstr ""
+
+#: cinder/volume/driver.py:386
+#, python-format
+msgid "Creating a new backup for volume %s."
+msgstr ""
+
+#: cinder/volume/driver.py:405
+#, python-format
+msgid "Restoring backup %(backup)s to volume %(volume)s."
+msgstr ""
+
+#: cinder/volume/driver.py:429
+msgid "Extend volume not implemented"
+msgstr ""
+
+#: cinder/volume/driver.py:463 cinder/volume/drivers/emc/emc_smis_iscsi.py:115
+msgid "ISCSI provider_location not stored, using discovery"
+msgstr ""
+
+#: cinder/volume/driver.py:514
+#, python-format
+msgid "Could not find iSCSI export for volume %s"
+msgstr ""
+
+#: cinder/volume/driver.py:518 cinder/volume/drivers/emc/emc_smis_iscsi.py:158
+#, python-format
+msgid "ISCSI Discovery: Found %s"
+msgstr ""
+
+#: cinder/volume/driver.py:615
+msgid "The volume driver requires the iSCSI initiator name in the connector."
+msgstr ""
+
+#: cinder/volume/driver.py:645 cinder/volume/drivers/lvm.py:335
+#: cinder/volume/drivers/storwize_svc.py:1505
+#: cinder/volume/drivers/zadara.py:663
+#: cinder/volume/drivers/emc/emc_smis_common.py:857
+#: cinder/volume/drivers/emc/emc_smis_iscsi.py:237
+#: cinder/volume/drivers/netapp/iscsi.py:825
+#: cinder/volume/drivers/netapp/iscsi.py:1175
+#: cinder/volume/drivers/nexenta/volume.py:429
+#: cinder/volume/drivers/windows/windows.py:206
+msgid "Updating volume stats"
+msgstr ""
+
+#: cinder/volume/driver.py:712
+msgid "ISER provider_location not stored, using discovery"
+msgstr ""
+
+#: cinder/volume/driver.py:760
+#, python-format
+msgid "Could not find iSER export for volume %s"
+msgstr ""
+
+#: cinder/volume/driver.py:764
+#, python-format
+msgid "ISER Discovery: Found %s"
+msgstr ""
+
+#: cinder/volume/driver.py:826
+#, python-format
+msgid "Failed to access the device on the path %(path)s: %(error)s."
+msgstr ""
+
+#: cinder/volume/driver.py:899
+#, python-format
+msgid "iSER device not found at %s"
+msgstr ""
+
+#: cinder/volume/driver.py:903
+#, python-format
+msgid ""
+"ISER volume not yet found at: %(host_device)s. Will rescan & retry.  Try "
+"number: %(tries)s."
+msgstr ""
+
+#: cinder/volume/driver.py:916
+#, python-format
+msgid "Found iSER node %(host_device)s (after %(tries)s rescans)."
+msgstr ""
+
+#: cinder/volume/driver.py:933 cinder/volume/manager.py:754
+#: cinder/volume/drivers/eqlx.py:247
+msgid "Updating volume status"
+msgstr ""
+
+#: cinder/volume/driver.py:1003
+msgid "Driver must implement initialize_connection"
+msgstr ""
+
+#: cinder/volume/manager.py:152
+#, python-format
+msgid "Driver path %s is deprecated, update your configuration to the new path."
+msgstr ""
+
+#: cinder/volume/manager.py:166
+#, python-format
+msgid "Starting volume driver %(driver_name)s (%(version)s)"
+msgstr ""
+
+#: cinder/volume/manager.py:173
+#, python-format
+msgid "Error encountered during initialization of driver: %s"
+msgstr ""
+
+#: cinder/volume/manager.py:178
+#, python-format
+msgid "Re-exporting %s volumes"
+msgstr ""
+
+#: cinder/volume/manager.py:183
+#, python-format
+msgid "volume %s stuck in a downloading state"
+msgstr ""
+
+#: cinder/volume/manager.py:188
+#, python-format
+msgid "volume %s: skipping export"
+msgstr ""
+
+#: cinder/volume/manager.py:190
+msgid "Resuming any in progress delete operations"
+msgstr ""
+
+#: cinder/volume/manager.py:193
+#, python-format
+msgid "Resuming delete on volume: %s"
+msgstr ""
+
+#: cinder/volume/manager.py:220
+msgid "Manager volume flow not retrieved"
+msgstr ""
+
+#: cinder/volume/manager.py:224
+msgid "Failed to successfully complete manager volume workflow"
+msgstr ""
+
+#: cinder/volume/manager.py:240 cinder/volume/manager.py:253
+#, python-format
+msgid "volume %s: deleting"
+msgstr ""
+
+#: cinder/volume/manager.py:246
+msgid "volume is not local to this node"
+msgstr ""
+
+#: cinder/volume/manager.py:251
+#, python-format
+msgid "volume %s: removing export"
+msgstr ""
+
+#: cinder/volume/manager.py:256
+#, python-format
+msgid "Cannot delete volume %s: volume is busy"
+msgstr ""
+
+#: cinder/volume/manager.py:284
+msgid "Failed to update usages deleting volume"
+msgstr ""
+
+#: cinder/volume/manager.py:289
+#, python-format
+msgid "volume %s: glance metadata deleted"
+msgstr ""
+
+#: cinder/volume/manager.py:292
+#, python-format
+msgid "no glance metadata found for volume %s"
+msgstr ""
+
+#: cinder/volume/manager.py:296
+#, python-format
+msgid "volume %s: deleted successfully"
+msgstr ""
+
+#: cinder/volume/manager.py:312
+#, python-format
+msgid "snapshot %s: creating"
+msgstr ""
+
+#: cinder/volume/manager.py:317
+#, python-format
+msgid "snapshot %(snap_id)s: creating"
+msgstr ""
+
+#: cinder/volume/manager.py:345
+#, python-format
+msgid ""
+"Failed updating %(snapshot_id)s metadata using the provided volumes "
+"%(volume_id)s metadata"
+msgstr ""
+
+#: cinder/volume/manager.py:351
+#, python-format
+msgid "snapshot %s: created successfully"
+msgstr ""
+
+#: cinder/volume/manager.py:361 cinder/volume/manager.py:366
+#, python-format
+msgid "snapshot %s: deleting"
+msgstr ""
+
+#: cinder/volume/manager.py:374
+#, python-format
+msgid "Cannot delete snapshot %s: snapshot is busy"
+msgstr ""
+
+#: cinder/volume/manager.py:404
+msgid "Failed to update usages deleting snapshot"
+msgstr ""
+
+#: cinder/volume/manager.py:407
+#, python-format
+msgid "snapshot %s: deleted successfully"
+msgstr ""
+
+#: cinder/volume/manager.py:427
+msgid "being attached by another instance"
+msgstr ""
+
+#: cinder/volume/manager.py:431
+msgid "being attached by another host"
+msgstr ""
+
+#: cinder/volume/manager.py:435
+msgid "being attached by different mode"
+msgstr ""
+
+#: cinder/volume/manager.py:526
+#, python-format
+msgid "Uploaded volume %(volume_id)s to image (%(image_id)s) successfully"
+msgstr ""
+
+#: cinder/volume/manager.py:650
+msgid "failed to create new_volume on destination host"
+msgstr ""
+
+#: cinder/volume/manager.py:653
+msgid "timeout creating new_volume on destination host"
+msgstr ""
+
+#: cinder/volume/manager.py:675
+#, python-format
+msgid "Failed to copy volume %(vol1)s to %(vol2)s"
+msgstr ""
+
+#: cinder/volume/manager.py:704
+#, python-format
+msgid "Failed to delete migration source vol %(vol)s: %(err)s"
+msgstr ""
+
+#: cinder/volume/manager.py:721
+#, python-format
+msgid "volume %s: calling driver migrate_volume"
+msgstr ""
+
+#: cinder/volume/manager.py:756
+msgid "Unabled to update stats, driver is uninitialized"
+msgstr ""
+
+#: cinder/volume/manager.py:771
+msgid "Clear capabilities"
+msgstr ""
+
+#: cinder/volume/manager.py:775
+#, python-format
+msgid "Notification {%s} received"
+msgstr ""
+
+#: cinder/volume/manager.py:813
+#, python-format
+msgid ""
+"Quota exceeded for %(s_pid)s, tried to extend volume by %(s_size)sG, "
+"(%(d_consumed)dG of %(d_quota)dG already consumed)"
+msgstr ""
+
+#: cinder/volume/manager.py:825
+#, python-format
+msgid "volume %s: extending"
+msgstr ""
+
+#: cinder/volume/manager.py:827
+#, python-format
+msgid "volume %s: extended successfully"
+msgstr ""
+
+#: cinder/volume/manager.py:829
+#, python-format
+msgid "volume %s: Error trying to extend volume"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:59
+#, python-format
+msgid "Valid consumer of QoS specs are: %s"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:86 cinder/volume/qos_specs.py:107
+#: cinder/volume/qos_specs.py:157 cinder/volume/qos_specs.py:199
+#: cinder/volume/qos_specs.py:213 cinder/volume/qos_specs.py:227
+#: cinder/volume/volume_types.py:45
+#, python-format
+msgid "DB error: %s"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:125 cinder/volume/qos_specs.py:142
+#: cinder/volume/qos_specs.py:274 cinder/volume/volume_types.py:54
+#: cinder/volume/volume_types.py:101
+msgid "id cannot be None"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:158
+#, python-format
+msgid "Failed to get all associations of qos specs %s"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:191
+#, python-format
+msgid ""
+"Type %(type_id)s is already associated with another qos specs: "
+"%(qos_specs_id)s"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:200
+#, python-format
+msgid "Failed to associate qos specs %(id)s with type: %(vol_type_id)s"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:214
+#, python-format
+msgid "Failed to disassociate qos specs %(id)s with type: %(vol_type_id)s"
+msgstr ""
+
+#: cinder/volume/qos_specs.py:228
+#, python-format
+msgid "Failed to disassociate qos specs %s."
+msgstr ""
+
+#: cinder/volume/qos_specs.py:286 cinder/volume/volume_types.py:113
+msgid "name cannot be None"
+msgstr ""
+
+#: cinder/volume/utils.py:157
+#, python-format
+msgid ""
+"Incorrect value error: %(blocksize)s, it may indicate that "
+"'volume_dd_blocksize' was configured incorrectly. Fall back to default."
+msgstr ""
+
+#: cinder/volume/volume_types.py:132
+#, python-format
+msgid ""
+"Default volume type is not found, please check default_volume_type "
+"config: %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:132
+#: cinder/volume/drivers/block_device.py:144 cinder/volume/drivers/lvm.py:583
+#: cinder/volume/drivers/lvm.py:598
+#, python-format
+msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:158 cinder/volume/drivers/lvm.py:616
+#, python-format
+msgid ""
+"Skipping remove_export. No iscsi_target is presently exported for volume:"
+" %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:184 cinder/volume/drivers/lvm.py:412
+#, python-format
+msgid "Skipping ensure_export. No iscsi_target provision for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:201 cinder/volume/drivers/lvm.py:433
+#, python-format
+msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:273 cinder/volume/drivers/lvm.py:211
+#, python-format
+msgid "Performing secure delete on volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:286 cinder/volume/drivers/lvm.py:226
+#, python-format
+msgid "Error unrecognized volume_clear option: %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:308 cinder/volume/drivers/lvm.py:280
+#: cinder/volume/drivers/zadara.py:519 cinder/volume/drivers/nexenta/nfs.py:179
+#, python-format
+msgid "Creating clone of volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:375
+msgid "No free disk"
+msgstr ""
+
+#: cinder/volume/drivers/block_device.py:388
+msgid "No big enough free disk"
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:86
+#, python-format
+msgid "Invalid ESM url scheme \"%s\". Supported https only."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:113
+msgid "Invalid REST handle name. Expected path."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:136
+#, python-format
+msgid "Call to json.loads() failed: %(ex)s. Response: %(resp)s"
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:226
+msgid "Session is expired. Relogin on ESM."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:246
+msgid "Reply is empty."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:248
+msgid "Error message is empty."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:286
+#, python-format
+msgid "Coraid Appliance ping failed: %s"
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:299
+#, python-format
+msgid "Volume \"%(name)s\" created with VSX LUN \"%(lun)s\""
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:313
+#, python-format
+msgid "Volume \"%s\" deleted."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:317
+#, python-format
+msgid "Resize volume \"%(name)s\" to %(size)s GB."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:321
+#, python-format
+msgid "Repository for volume \"%(name)s\" found: \"%(repo)s\""
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:335
+#, python-format
+msgid "Volume \"%(name)s\" resized. New size is %(size)s GB."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:387
+msgid "Cannot create clone volume in different repository."
+msgstr ""
+
+#: cinder/volume/drivers/coraid.py:507
+#, python-format
+msgid "Initialize connection %(shelf)s/%(lun)s for %(name)s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:139
+#, python-format
+msgid ""
+"CLI output\n"
+"%s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:154
+msgid "Reading CLI MOTD"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:158
+#, python-format
+msgid "Setting CLI terminal width: '%s'"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:162
+#, python-format
+msgid "Sending CLI command: '%s'"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:169
+msgid "Error executing EQL command"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:199
+#, python-format
+msgid "EQL-driver: executing \"%s\""
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:208
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:377
+#, python-format
+msgid "SSH Command failed after '%(total_attempts)r' attempts : '%(command)s'"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:215 cinder/volume/drivers/san/san.py:151
+#, python-format
+msgid "Error running SSH command: %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:282
+#, python-format
+msgid "Volume %s does not exist, it may have already been deleted"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:300
+#, python-format
+msgid "EQL-driver: Setup is complete, group IP is %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:304
+msgid "Failed to setup the Dell EqualLogic driver"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:320
+#, python-format
+msgid "Failed to create volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:329
+#, python-format
+msgid "Volume %s was not found while trying to delete it"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:333
+#, python-format
+msgid "Failed to delete volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:348
+#, python-format
+msgid "Failed to create snapshot of volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:361
+#, python-format
+msgid "Failed to create volume from snapshot %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:374
+#, python-format
+msgid "Failed to create clone of volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:384
+#, python-format
+msgid "Failed to delete snapshot %(snap)s of volume %(vol)s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:405
+#, python-format
+msgid "Failed to initialize connection to volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:415
+#, python-format
+msgid "Failed to terminate connection to volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:436
+#, python-format
+msgid "Volume %s is not found!, it may have been deleted"
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:440
+#, python-format
+msgid "Failed to ensure export of volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:83
+#, python-format
+msgid "There's no Gluster config file configured (%s)"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:88
+#, python-format
+msgid "Gluster config file at %(config)s doesn't exist"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:100
+msgid "mount.glusterfs is not installed"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:141
+#, python-format
+msgid "Cloning volume %(src)s to volume %(dst)s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:146
+msgid "Volume status must be 'available'."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:181 cinder/volume/drivers/nfs.py:94
+#: cinder/volume/drivers/netapp/nfs.py:727
+#, python-format
+msgid "casted to %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:194
+msgid "Snapshot status must be \"available\" to clone."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:216
+#, python-format
+msgid "snapshot: %(snap)s, volume: %(vol)s, volume_size: %(size)s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:226
+#, python-format
+msgid "will copy from snapshot at %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:244 cinder/volume/drivers/nfs.py:144
+#, python-format
+msgid "Volume %s does not have provider_location specified, skipping"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:332
+#, python-format
+msgid "Volume status must be \"available\" or \"in-use\" for snapshot. (is %s)"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:362
+#, python-format
+msgid "nova call result: %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:364
+msgid "Call to Nova to create snapshot failed"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:386
+msgid "Nova returned \"error\" status while creating snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:390
+#, python-format
+msgid "Status of snapshot %(id)s is now %(status)s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:403
+#, python-format
+msgid "Timed out while waiting for Nova update for creation of snapshot %s."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:415
+#, python-format
+msgid "create snapshot: %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:416
+#, python-format
+msgid "volume id: %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:493
+msgid "'active' must be present when writing snap_info."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:514
+#, python-format
+msgid "deleting snapshot %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:518
+msgid "Volume status must be \"available\" or \"in-use\"."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:527
+#, python-format
+msgid "snapshot_file for this snap is %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:533
+#, python-format
+msgid "Snapshot file at %s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:550
+#, python-format
+msgid "No base file found for %s."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:561
+#, python-format
+msgid "No %(base_id)s found for %(file)s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:615
+#, python-format
+msgid "No file found with %s as backing file."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:625
+#, python-format
+msgid "No snap found with %s as backing file."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:636
+#, python-format
+msgid "No file depends on %s."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:662
+#, python-format
+msgid "Check condition failed: %s expected to be None."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:706
+msgid "Call to Nova delete snapshot failed"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:724
+#, python-format
+msgid "status of snapshot %s is still \"deleting\"... waiting"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:730
+#, python-format
+msgid "Unable to delete snapshot %(id)s, status: %(status)s."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:743
+#, python-format
+msgid "Timed out while waiting for Nova update for deletion of snapshot %(id)s."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:850
+#, python-format
+msgid "%s must be a valid raw or qcow2 image."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:911
+msgid "Extend volume is only supported for this driver when no snapshots exist."
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:919
+#, python-format
+msgid "Unrecognized backing format: %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:935
+#, python-format
+msgid "creating new volume at %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:938
+#, python-format
+msgid "file already exists at %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:964 cinder/volume/drivers/nfs.py:131
+#, python-format
+msgid "Exception during mounting %s"
+msgstr ""
+
+#: cinder/volume/drivers/glusterfs.py:966
+#, python-format
+msgid "Available shares: %s"
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:94
+#, python-format
+msgid "GPFS is not active.  Detailed output: %s"
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:95
+#, python-format
+msgid "GPFS is not running - state: %s"
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:138
+msgid "Option gpfs_mount_point_base is not set correctly."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:145
+msgid "Option gpfs_images_share_mode is not set correctly."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:151
+msgid "Option gpfs_images_dir is not set correctly."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:158
+#, python-format
+msgid ""
+"gpfs_images_share_mode is set to copy_on_write, but %(vol)s and %(img)s "
+"belong to different file systems"
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:167
+#, python-format
+msgid ""
+"Downlevel GPFS Cluster Detected.  GPFS Clone feature not enabled in "
+"cluster daemon level %(cur)s - must be at least at level %(min)s."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:181
+#, python-format
+msgid "%s must be an absolute path."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:186
+#, python-format
+msgid "%s is not a directory."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:194
+#, python-format
+msgid "%s is not on GPFS. Perhaps GPFS not mounted."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:201
+#, python-format
+msgid ""
+"The GPFS filesystem %(fs)s is not at the required release level.  Current"
+" level is %(cur)s, must be at least %(min)s."
+msgstr ""
+
+#: cinder/volume/drivers/gpfs.py:566
+#, python-format
+msgid "mkfs failed on volume %(vol)s, error message was: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:206
+#, python-format
+msgid "Size for volume: %s not found, skipping secure delete."
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:244
+#, python-format
+msgid "snapshot: %s not found, skipping delete operations"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:337
+#, python-format
+msgid "Unable to update stats on non-intialized Volume Group: %s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:411
+#, python-format
+msgid "volume_info:%s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:447 cinder/volume/drivers/lvm.py:732
+msgid "Detected inconsistency in provider_location id"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:448 cinder/volume/drivers/lvm.py:652
+#: cinder/volume/drivers/huawei/rest_common.py:585
+#: cinder/volume/drivers/huawei/rest_common.py:625
+#: cinder/volume/drivers/huawei/rest_common.py:638
+#: cinder/volume/drivers/huawei/rest_common.py:807
+#: cinder/volume/drivers/huawei/rest_common.py:1021
+#: cinder/volume/drivers/huawei/rest_common.py:1046
+#: cinder/volume/drivers/huawei/rest_common.py:1109
+#: cinder/volume/drivers/huawei/rest_common.py:1181
+#: cinder/volume/drivers/huawei/rest_common.py:1224
+#, python-format
+msgid "%s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:499
+#, python-format
+msgid "Symbolic link %s not found"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:718
+#, python-format
+msgid "Skipping ensure_export. No iser_target provisioned for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:809
+#, python-format
+msgid "Skipping remove_export. No iser_target provisioned for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:825
+#, python-format
+msgid ""
+"Skipping remove_export. No iser_target is presently exported for volume: "
+"%s"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:233
+#, python-format
+msgid "Expected volume size was %d"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:234
+#, python-format
+msgid " but size is now %d"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:326
+#, python-format
+msgid "%s is already mounted"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:375
+#, python-format
+msgid "There's no NFS config file configured (%s)"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:380
+#, python-format
+msgid "NFS config file at %(config)s doesn't exist"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:385
+#, python-format
+msgid "NFS config 'nfs_oversub_ratio' invalid.  Must be > 0: %s"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:393
+#, python-format
+msgid "NFS config 'nfs_used_ratio' invalid.  Must be > 0 and <= 1.0: %s"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:446
+#, python-format
+msgid "Selected %s as target nfs share."
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:479
+#, python-format
+msgid "%s is above nfs_used_ratio"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:482
+#, python-format
+msgid "%s is above nfs_oversub_ratio"
+msgstr ""
+
+#: cinder/volume/drivers/nfs.py:485
+#, python-format
+msgid "%s reserved space is above nfs_oversub_ratio"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:161
+#, python-format
+msgid "Invalid argument - whence=%s not supported"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:165
+msgid "Invalid argument"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:176
+msgid "flush() not supported in this version of librbd"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:184
+msgid "fileno() not supported by RBD()"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:211
+#, python-format
+msgid "error opening rbd image %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:260
+msgid "rados and rbd python libraries not found"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:266
+msgid "error connecting to ceph cluster"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:342 cinder/volume/drivers/sheepdog.py:178
+msgid "error refreshing volume stats"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:373
+#, python-format
+msgid "clone depth exceeds limit of %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:407
+#, python-format
+msgid "maximum clone depth (%d) has been reached - flattening source volume"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:419
+#, python-format
+msgid "flattening source volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:431
+#, python-format
+msgid "creating snapshot='%s'"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:441
+#, python-format
+msgid "cloning '%(src_vol)s@%(src_snap)s' to '%(dest)s'"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:455
+msgid "clone created successfully"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:464
+#, python-format
+msgid "creating volume '%s'"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:480
+#, python-format
+msgid "flattening %(pool)s/%(img)s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:486
+#, python-format
+msgid "cloning %(pool)s/%(img)s@%(snap)s to %(dst)s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:523
+msgid "volume has no backup snaps"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:546
+#, python-format
+msgid "volume %s is not a clone"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:564
+#, python-format
+msgid "deleting parent snapshot %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:575
+#, python-format
+msgid "deleting parent %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:598
+msgid "volume has clone snapshot(s)"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:614
+#, python-format
+msgid "deleting rbd volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:620
+msgid "volume is a clone so cleaning references"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:674
+#, python-format
+msgid "connection data: %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:683
+msgid "Not stored in rbd"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:687
+msgid "Blank components"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:690
+msgid "Not an rbd snapshot"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:702
+#, python-format
+msgid "not cloneable: %s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:706
+#, python-format
+msgid "%s is in a different ceph cluster"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:718
+#, python-format
+msgid "Unable to open image %(loc)s: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:786
+msgid "volume backup complete."
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:799
+msgid "volume restore complete."
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:809 cinder/volume/drivers/sheepdog.py:195
+#, python-format
+msgid "Failed to Extend Volume %(volname)s"
+msgstr ""
+
+#: cinder/volume/drivers/rbd.py:814 cinder/volume/drivers/sheepdog.py:200
+#: cinder/volume/drivers/windows/windows.py:224
+#, python-format
+msgid "Extend volume from %(old_size)s GB to %(new_size)s GB."
+msgstr ""
+
+#: cinder/volume/drivers/scality.py:66
+msgid "Value required for 'scality_sofs_config'"
+msgstr ""
+
+#: cinder/volume/drivers/scality.py:77
+#, python-format
+msgid "Cannot access 'scality_sofs_config': %s"
+msgstr ""
+
+#: cinder/volume/drivers/scality.py:83
+msgid "Cannot execute /sbin/mount.sofs"
+msgstr ""
+
+#: cinder/volume/drivers/scality.py:104
+msgid "Cannot mount Scality SOFS, check syslog for errors"
+msgstr ""
+
+#: cinder/volume/drivers/scality.py:138
+#, python-format
+msgid "Cannot find volume dir for Scality SOFS at '%s'"
+msgstr ""
+
+#: cinder/volume/drivers/sheepdog.py:59
+#, python-format
+msgid "Sheepdog is not working: %s"
+msgstr ""
+
+#: cinder/volume/drivers/sheepdog.py:64
+msgid "Sheepdog is not working"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:142
+#, python-format
+msgid "Payload for SolidFire API call: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:149
+#, python-format
+msgid ""
+"Failed to make httplib connection SolidFire Cluster: %s (verify san_ip "
+"settings)"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:152
+#, python-format
+msgid "Failed to make httplib connection: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:159
+#, python-format
+msgid ""
+"Request to SolidFire cluster returned bad status: %(status)s / %(reason)s"
+" (check san_login/san_password settings)"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:164
+#, python-format
+msgid "HTTP request failed, with status: %(status)s and reason: %(reason)s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:175
+#, python-format
+msgid "Call to json.loads() raised an exception: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:181
+#, python-format
+msgid "Results of SolidFire API call: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:185
+#, python-format
+msgid "Clone operation encountered: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:187
+#, python-format
+msgid "Waiting for outstanding operation before retrying snapshot: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:193
+#, python-format
+msgid "Detected xDBVersionMismatch, retry %s of 5"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:200
+#: cinder/volume/drivers/solidfire.py:267
+#: cinder/volume/drivers/solidfire.py:357
+#, python-format
+msgid "API response: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:220
+#, python-format
+msgid "Found solidfire account: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:249
+#, python-format
+msgid "solidfire account: %s does not exist, create it..."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:311
+#, python-format
+msgid "Failed to retrieve volume SolidFire-ID: %s in get_by_account!"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:389
+msgid "Failed to get model update from clone"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:401
+#, python-format
+msgid "Failed volume create: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:416
+#, python-format
+msgid "More than one valid preset was detected, using %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:441
+#, python-format
+msgid "Failed to get SolidFire Volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:450
+#, python-format
+msgid "Mapped SolidFire volumeID %(sfid)s to cinder ID %(uuid)s."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:459
+#, python-format
+msgid "Volume %s, not found on SF Cluster."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:462
+#, python-format
+msgid "Found %(count)s volumes mapped to id: %(uuid)s."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:531
+msgid "Enter SolidFire delete_volume..."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:535
+#, python-format
+msgid "Account for Volume ID %s was not found on the SolidFire Cluster!"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:537
+msgid "This usually means the volume was never succesfully created."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:550
+#, python-format
+msgid "Failed to delete SolidFire Volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:553
+#: cinder/volume/drivers/solidfire.py:627
+#: cinder/volume/drivers/solidfire.py:690
+#: cinder/volume/drivers/solidfire.py:715
+#, python-format
+msgid "Volume ID %s was not found on the SolidFire Cluster!"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:556
+msgid "Leaving SolidFire delete_volume"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:560
+msgid "Executing SolidFire ensure_export..."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:568
+msgid "Executing SolidFire create_export..."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:619
+msgid "Entering SolidFire extend_volume..."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:641
+msgid "Leaving SolidFire extend_volume"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:646
+msgid "Updating cluster status info"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:654
+msgid "Failed to get updated stats"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:684
+#: cinder/volume/drivers/solidfire.py:709
+msgid "Entering SolidFire attach_volume..."
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:754
+msgid "Leaving SolidFire transfer volume"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:186
+#, python-format
+msgid "WWPN on node %(node)s: %(wwpn)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:192
+msgid "enter: do_setup"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:199
+msgid "do_setup: Could not get system name"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:210
+#, python-format
+msgid "do_setup: Pool %s does not exist"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:228
+msgid "Failed to get license information."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:251
+#, python-format
+msgid ""
+"Expected integers for node_count and vdisk_count, svcinfo lsiogrp "
+"returned: %(node)s and %(vdisk)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:314
+msgid "do_setup: No configured nodes"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:316
+msgid "leave: do_setup"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:339
+msgid "enter: check_for_setup_error"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:343
+msgid "Unable to determine system name"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:346
+msgid "Unable to determine system id"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:349
+msgid "Unable to determine pool extent size"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:356
+#: cinder/volume/drivers/netapp/iscsi.py:131
+#: cinder/volume/drivers/netapp/nfs.py:614
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:159
+#, python-format
+msgid "%s is not set"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:362
+msgid ""
+"Password or SSH private key is required for authentication: set either "
+"san_password or san_private_key option"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:370
+#, python-format
+msgid ""
+"Illegal value %d specified for storwize_svc_flashcopy_timeout: valid "
+"values are between 0 and 600"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:378
+msgid "leave: check_for_setup_error"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:392
+#, python-format
+msgid "ensure_export: Volume %s not found on storage"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:416
+#, python-format
+msgid "enter: _get_chap_secret_for_host: host name %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:452
+#, python-format
+msgid ""
+"leave: _get_chap_secret_for_host: host name %(host_name)s with secret "
+"%(chap_secret)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:475
+msgid "_create_host: Cannot clean host name. Host name is not unicode or string"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:543
+#, python-format
+msgid "enter: _get_host_from_connector: prefix %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:571
+#, python-format
+msgid "leave: _get_host_from_connector: host %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:583
+#, python-format
+msgid "enter: _create_host: host %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:598
+msgid "_create_host: No connector ports"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:614
+#, python-format
+msgid "leave: _create_host: host %(host)s - %(host_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:637
+#, python-format
+msgid "enter: _map_vol_to_host: volume %(volume_name)s to host %(host_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:667
+msgid ""
+"storwize_svc_multihostmap_enabled is set to False, Not allow multi host "
+"mapping"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:680
+#, python-format
+msgid "volume %s mapping to multi host"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:686
+#, python-format
+msgid ""
+"leave: _map_vol_to_host: LUN %(result_lun)s, volume %(volume_name)s, host"
+" %(host_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:696
+#, python-format
+msgid "enter: _delete_host: host %s "
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:704
+#, python-format
+msgid "leave: _delete_host: host %s "
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:730
+msgid "The connector does not contain the required information."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:749
+#, python-format
+msgid "enter: initialize_connection: volume %(vol)s with connector %(conn)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:765
+msgid "_create_host failed to return the host name."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:776
+#, python-format
+msgid "initialize_connection: Failed to get attributes for volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:783
+#, python-format
+msgid "Did not find expected column name in lsvdisk: %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:785
+#, python-format
+msgid "initialize_connection: Missing volume attribute for volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:802
+#, python-format
+msgid ""
+"initialize_connection: No node found in I/O group %(gid)s for volume "
+"%(vol)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:811
+#, python-format
+msgid "initialize_connection: Did not find a preferred node for volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:833
+msgid ""
+"Could not get FC connection information for the host-volume connection. "
+"Is the host configured properly for FC connections?"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:848
+#, python-format
+msgid ""
+"initialize_connection: Failed to collect return properties for volume "
+"%(vol)s and connector %(conn)s.\n"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:853
+#, python-format
+msgid ""
+"leave: initialize_connection:\n"
+" volume: %(vol)s\n"
+" connector %(conn)s\n"
+" properties: %(prop)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:871
+#, python-format
+msgid "enter: terminate_connection: volume %(vol)s with connector %(conn)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:881
+msgid "_get_host_from_connector failed to return the host name for connector"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:896
+#, python-format
+msgid ""
+"terminate_connection: No mapping of volume %(vol_name)s to host "
+"%(host_name)s found"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:904
+#, python-format
+msgid "leave: terminate_connection: volume %(vol)s with connector %(conn)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:961
+msgid "protocol must be specified as '<in> iSCSI' or '<in> FC'"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:985
+#, python-format
+msgid "enter: _create_vdisk: vdisk %s "
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1004
+#, python-format
+msgid ""
+"_create_vdisk %(name)s - did not find success message in CLI output.\n"
+" stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1009
+#, python-format
+msgid "leave: _create_vdisk: volume %s "
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1019
+#: cinder/volume/drivers/storwize_svc.py:1033
+#, python-format
+msgid ""
+"create FC mapping from %(source)s to %(target)s - did not find success "
+"message in CLI output.\n"
+" stdout: %(out)s\n"
+" stderr: %(err)s\n"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1045
+#: cinder/volume/drivers/storwize_svc.py:1055
+#, python-format
+msgid ""
+"create FC mapping from %(source)s to %(target)s - did not find mapping id"
+" in CLI output.\n"
+" stdout: %(out)s\n"
+" stderr: %(err)s\n"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1069
+#, python-format
+msgid ""
+"_prepare_fc_map: Failed to prepare FlashCopy from %(source)s to "
+"%(target)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1096
+#, python-format
+msgid ""
+"Unexecpted mapping status %(status)s for mapping %(id)s. Attributes: "
+"%(attr)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1108
+#, python-format
+msgid ""
+"Mapping %(id)s prepare failed to complete within the allotted %(to)d "
+"seconds timeout. Terminating."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1113
+#, python-format
+msgid ""
+"_prepare_fc_map: Failed to start FlashCopy from %(source)s to %(target)s "
+"with exception %(ex)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1120
+#, python-format
+msgid "_prepare_fc_map: %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1127
+#, python-format
+msgid ""
+"_start_fc_map: Failed to start FlashCopy from %(source)s to %(target)s.\n"
+"stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1138
+#, python-format
+msgid ""
+"enter: _run_flashcopy: execute FlashCopy from source %(source)s to target"
+" %(target)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1150
+#, python-format
+msgid "leave: _run_flashcopy: FlashCopy started from %(source)s to %(target)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1158
+#, python-format
+msgid "enter: _create_copy: snapshot %(tgt_vdisk)s from vdisk %(src_vdisk)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1165
+#, python-format
+msgid "_create_copy: Source vdisk %s does not exist"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1177
+#, python-format
+msgid ""
+"_create_copy: cannot get source vdisk %(src)s capacity from vdisk "
+"attributes %(attr)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1187
+#, python-format
+msgid "leave: _create_copy: snapshot %(tgt_vdisk)s from vdisk %(src_vdisk)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1192
+#, python-format
+msgid "enter: _get_flashcopy_mapping_attributes: mapping %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1214
+#, python-format
+msgid ""
+"leave: _get_flashcopy_mapping_attributes: mapping %(fc_map_id)s, "
+"attributes %(attributes)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1222
+#, python-format
+msgid "enter: _is_vdisk_defined: vdisk %s "
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1224
+#, python-format
+msgid "leave: _is_vdisk_defined: vdisk %(vol)s with %(str)s "
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1257
+#, python-format
+msgid "Vdisk %(name)s not involved in mapping %(src)s -> %(tgt)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1303
+#, python-format
+msgid "enter: _delete_vdisk: vdisk %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1308
+#, python-format
+msgid "warning: Tried to delete vdisk %s but it does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1323
+#, python-format
+msgid "leave: _delete_vdisk: vdisk %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1348
+msgid "create_volume_from_snapshot: Source and destination size differ."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1363
+msgid "create_cloned_volume: Source and destination size differ."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1377
+#, python-format
+msgid "enter: extend_volume: volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1381
+msgid "extend_volume: Extending a volume with snapshots is not supported."
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1393
+#, python-format
+msgid "leave: extend_volume: volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1409
+#, python-format
+msgid "enter: migrate_volume: id=%(id)s, host=%(host)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1438
+msgid "migrate_volume started with more than one vdisk copy"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1456
+#, python-format
+msgid ""
+"migrate_volume %(name)s - did not find success message in CLI output.\n"
+" stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1468
+msgid "migrate_volume: Could not get vdisk copy data"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1483
+#, python-format
+msgid "leave: migrate_volume: id=%(id)s, host=%(host)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1526
+msgid "Could not get pool data from the storage"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1527
+msgid "_update_volume_stats: Could not get storage pool data"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1612
+msgid ""
+"Illegal value specified for storwize_svc_vol_rsize: set to either a "
+"percentage (0-100) or -1"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1618
+msgid ""
+"Illegal value specified for storwize_svc_vol_warning: set to a percentage"
+" (0-100)"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1625
+msgid ""
+"Illegal value specified for storwize_svc_vol_grainsize: set to either 32,"
+" 64, 128, or 256"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1632
+msgid "System does not support compression"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1637
+msgid "If compression is set to True, rsize must also be set (not equal to -1)"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1643
+#, python-format
+msgid ""
+"Illegal value %(prot)s specified for storwize_svc_connection_protocol: "
+"valid values are %(enabled)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1651
+#, python-format
+msgid "I/O group %(iogrp)d is not valid; available I/O groups are %(avail)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1664
+#, python-format
+msgid "enter: _execute_command_and_parse_attributes:  command %s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1671
+#, python-format
+msgid ""
+"CLI Exception output:\n"
+" command: %(cmd)s\n"
+" stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1688
+#, python-format
+msgid ""
+"leave: _execute_command_and_parse_attributes:\n"
+"command: %(cmd)s\n"
+"attributes: %(attr)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1707
+#, python-format
+msgid ""
+"_get_hdr_dic: attribute headers and values do not match.\n"
+" Headers: %(header)s\n"
+" Values: %(row)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1715
+#, python-format
+msgid ""
+"%(fun)s: Failed with unexpected CLI output.\n"
+" Command: %(cmd)s\n"
+"stdout: %(out)s\n"
+"stderr: %(err)s\n"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1729
+#, python-format
+msgid ""
+"%(fun)s: Failed with unexpected CLI output.\n"
+" Command: %(cmd)s\n"
+" stdout: %(out)s\n"
+" stderr: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/storwize_svc.py:1737
+#, python-format
+msgid "Did not find expected column in %(fun)s: %(hdr)s"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:244
+#, python-format
+msgid "Sending %(method)s to %(url)s. Body \"%(body)s\""
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:268
+#, python-format
+msgid "Operation completed. %(data)s"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:366
+#, python-format
+msgid "Pool %(name)s: %(total)sGB total, %(free)sGB free"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:418 cinder/volume/drivers/zadara.py:541
+#, python-format
+msgid "Volume %(name)s could not be found. It might be already deleted"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:448
+#, python-format
+msgid "Create snapshot: %s"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:455 cinder/volume/drivers/zadara.py:500
+#: cinder/volume/drivers/zadara.py:526
+#, python-format
+msgid "Volume %(name)s not found"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:466
+#, python-format
+msgid "Delete snapshot: %s"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:474
+#, python-format
+msgid "snapshot: original volume %s not found, skipping delete operation"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:482
+#, python-format
+msgid "snapshot: snapshot %s not found, skipping delete operation"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:493
+#, python-format
+msgid "Creating volume from snapshot: %s"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:506
+#, python-format
+msgid "Snapshot %(name)s not found"
+msgstr ""
+
+#: cinder/volume/drivers/zadara.py:625
+#, python-format
+msgid "Attach properties: %(properties)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:41
+msgid ""
+"Module PyWBEM not installed.  Install PyWBEM using the python-pywbem "
+"package."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:77
+msgid "Entering create_volume."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:81
+#, python-format
+msgid "Create Volume: %(volume)s  Size: %(size)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:89
+#, python-format
+msgid "Create Volume: %(volume)s  Storage type: %(storage_type)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:96
+#, python-format
+msgid ""
+"Create Volume: %(volume)s  Pool: %(pool)s  Storage System: "
+"%(storage_system)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:105
+#, python-format
+msgid ""
+"Error Create Volume: %(volumename)s. Storage Configuration Service not "
+"found for pool %(storage_type)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:113
+#, python-format
+msgid ""
+"Create Volume: %(name)s  Method: CreateOrModifyElementFromStoragePool  "
+"ConfigServicie: %(service)s  ElementName: %(name)s  InPool: %(pool)s  "
+"ElementType: 5  Size: %(size)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:128
+#, python-format
+msgid "Create Volume: %(volumename)s  Return code: %(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:135
+#, python-format
+msgid ""
+"Error Create Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
+"%(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:142
+#, python-format
+msgid "Leaving create_volume: %(volumename)s  Return code: %(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:150
+msgid "Entering create_volume_from_snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:155
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:165
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s  Snapshot Instance: %(snapshotinstance)s  Storage "
+"System: %(storage_system)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:175
+#, python-format
+msgid ""
+"Error Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s. Create Volume from Snapshot is NOT supported on VMAX."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:186
+#, python-format
+msgid ""
+"Error Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s. Cannot find Replication Service to create volume from "
+"snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:195
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s  Method: CreateElementReplica  ReplicationService: "
+"%(service)s  ElementName: %(elementname)s  SyncType: 8  SourceElement: "
+"%(sourceelement)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:216
+#, python-format
+msgid ""
+"Error Create Volume from Snapshot: Volume: %(volumename)s  "
+"Snapshot:%(snapshotname)s.  Return code: %(rc)lu.Error: %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:228
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s.  Successfully clone volume from snapshot.  Finding the "
+"clone relationship."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:239
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s.  Remove the clone relationship. Method: "
+"ModifyReplicaSynchronization ReplicationService: %(service)s  Operation: "
+"8  Synchronization: %(sync_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:255
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s  Return code: %(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:264
+#, python-format
+msgid ""
+"Error Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s.  Return code: %(rc)lu.  Error: %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:276
+#, python-format
+msgid ""
+"Leaving create_volume_from_snapshot: Volume: %(volumename)s Snapshot: "
+"%(snapshotname)s  Return code: %(rc)lu."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:285
+msgid "Entering create_cloned_volume."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:290
+#, python-format
+msgid ""
+"Create a Clone from Volume: Volume: %(volumename)s  Source Volume: "
+"%(srcname)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:300
+#, python-format
+msgid ""
+"Create Cloned Volume: Volume: %(volumename)s  Source Volume: %(srcname)s"
+"  Source Instance: %(src_instance)s  Storage System: %(storage_system)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:310
+#, python-format
+msgid ""
+"Error Create Cloned Volume: Volume: %(volumename)s  Source Volume: "
+"%(srcname)s. Cannot find Replication Service to create cloned volume."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:319
+#, python-format
+msgid ""
+"Create Cloned Volume: Volume: %(volumename)s  Source Volume: %(srcname)s"
+"  Method: CreateElementReplica  ReplicationService: %(service)s  "
+"ElementName: %(elementname)s  SyncType: 8  SourceElement: "
+"%(sourceelement)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:340
+#, python-format
+msgid ""
+"Error Create Cloned Volume: Volume: %(volumename)s  Source "
+"Volume:%(srcname)s.  Return code: %(rc)lu.Error: %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:352
+#, python-format
+msgid ""
+"Create Cloned Volume: Volume: %(volumename)s  Source Volume: %(srcname)s."
+"  Successfully cloned volume from source volume.  Finding the clone "
+"relationship."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:363
+#, python-format
+msgid ""
+"Create Cloned Volume: Volume: %(volumename)s  Source Volume: %(srcname)s."
+"  Remove the clone relationship. Method: ModifyReplicaSynchronization "
+"ReplicationService: %(service)s  Operation: 8  Synchronization: "
+"%(sync_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:379
+#, python-format
+msgid ""
+"Create Cloned Volume: Volume: %(volumename)s  Source Volume: %(srcname)s"
+"  Return code: %(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:388
+#, python-format
+msgid ""
+"Error Create Cloned Volume: Volume: %(volumename)s  Source Volume: "
+"%(srcname)s.  Return code: %(rc)lu.  Error: %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:400
+#, python-format
+msgid ""
+"Leaving create_cloned_volume: Volume: %(volumename)s Source Volume: "
+"%(srcname)s  Return code: %(rc)lu."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:409
+msgid "Entering delete_volume."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:411
+#, python-format
+msgid "Delete Volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:418
+#, python-format
+msgid "Volume %(name)s not found on the array. No volume to delete."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:428
+#, python-format
+msgid ""
+"Error Delete Volume: %(volumename)s. Storage Configuration Service not "
+"found."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:436
+#, python-format
+msgid "Delete Volume: %(name)s  DeviceID: %(deviceid)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:440
+#, python-format
+msgid ""
+"Delete Volume: %(name)s  Method: EMCReturnToStoragePool ConfigServic: "
+"%(service)s  TheElement: %(vol_instance)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:454
+#, python-format
+msgid ""
+"Error Delete Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
+"%(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:463
+#, python-format
+msgid "Leaving delete_volume: %(volumename)s  Return code: %(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:470
+msgid "Entering create_snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:474
+#, python-format
+msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:486
+#, python-format
+msgid "Device ID: %(deviceid)s: Storage System: %(storagesystem)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:493
+#: cinder/volume/drivers/emc/emc_smis_common.py:495
+#: cinder/volume/drivers/emc/emc_smis_common.py:565
+#, python-format
+msgid "Cannot find Replication Service to create snapshot for volume %s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:500
+#, python-format
+msgid ""
+"Create Snapshot:  Method: CreateElementReplica: Target: %(snapshot)s  "
+"Source: %(volume)s  Replication Service: %(service)s  ElementName: "
+"%(elementname)s  Sync Type: 7  SourceElement: %(sourceelement)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:516
+#, python-format
+msgid ""
+"Create Snapshot: Volume: %(volumename)s  Snapshot: %(snapshotname)s  "
+"Return code: %(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:525
+#, python-format
+msgid ""
+"Error Create Snapshot: %(snapshot)s Volume: %(volume)s Error: "
+"%(errordesc)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:533
+#, python-format
+msgid ""
+"Leaving create_snapshot: Snapshot: %(snapshot)s Volume: %(volume)s  "
+"Return code: %(rc)lu."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:539
+msgid "Entering delete_snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:543
+#, python-format
+msgid "Delete Snapshot: %(snapshot)s: volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:549
+#, python-format
+msgid ""
+"Delete Snapshot: %(snapshot)s: volume: %(volume)s. Finding "
+"StorageSychronization_SV_SV."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:557
+#, python-format
+msgid ""
+"Snapshot: %(snapshot)s: volume: %(volume)s not found on the array. No "
+"snapshot to delete."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:572
+#, python-format
+msgid ""
+"Delete Snapshot: Target: %(snapshot)s  Source: %(volume)s.  Method: "
+"ModifyReplicaSynchronization:  Replication Service: %(service)s  "
+"Operation: 19  Synchronization: %(sync_name)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:588
+#, python-format
+msgid ""
+"Delete Snapshot: Volume: %(volumename)s  Snapshot: %(snapshotname)s  "
+"Return code: %(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:597
+#, python-format
+msgid ""
+"Error Delete Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s. Return code: %(rc)lu. Error: %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:609
+#, python-format
+msgid ""
+"Leaving delete_snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s  Return code: %(rc)lu."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:619
+#, python-format
+msgid "Create export: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:624
+#, python-format
+msgid "create_export: Volume: %(volume)s  Device ID: %(device_id)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:646
+#, python-format
+msgid ""
+"ExposePaths: %(vol)s  ConfigServicie: %(service)s  LUNames: %(lun_name)s"
+"  InitiatorPortIDs: %(initiator)s  DeviceAccesses: 2"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:661
+#, python-format
+msgid "ExposePaths parameter LunMaskingSCSIProtocolController: %(lunmasking)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:672
+#, python-format
+msgid "Error mapping volume %s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:676
+#, python-format
+msgid "ExposePaths for volume %s completed successfully."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:692
+#, python-format
+msgid ""
+"HidePaths: %(vol)s  ConfigServicie: %(service)s  LUNames: %(device_id)s  "
+"LunMaskingSCSIProtocolController: %(lunmasking)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:705
+#, python-format
+msgid "Error unmapping volume %s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:709
+#, python-format
+msgid "HidePaths for volume %s completed successfully."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:722
+#, python-format
+msgid ""
+"AddMembers: ConfigServicie: %(service)s  MaskingGroup: %(masking_group)s"
+"  Members: %(vol)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:737
+#, python-format
+msgid "Error mapping volume %(vol)s. %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:742
+#, python-format
+msgid "AddMembers for volume %s completed successfully."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:755
+#, python-format
+msgid ""
+"RemoveMembers: ConfigServicie: %(service)s  MaskingGroup: "
+"%(masking_group)s  Members: %(vol)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:768
+#, python-format
+msgid "Error unmapping volume %(vol)s. %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:773
+#, python-format
+msgid "RemoveMembers for volume %s completed successfully."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:779
+#, python-format
+msgid "Map volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:788
+#: cinder/volume/drivers/emc/emc_smis_common.py:818
+#, python-format
+msgid "Cannot find Controller Configuration Service for storage system %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:802
+#, python-format
+msgid "Unmap volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:808
+#, python-format
+msgid "Volume %s is not mapped. No volume to unmap."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:832
+#, python-format
+msgid "Initialize connection: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:838
+#, python-format
+msgid "Volume %s is already mapped."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:850
+#, python-format
+msgid "Terminate connection: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:882
+#, python-format
+msgid "Found Storage Type: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:885
+msgid "Storage type not found."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:901
+#, python-format
+msgid "Found Masking View: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:904
+msgid "Masking View not found."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:926
+msgid "Ecom user not found."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:946
+#, python-format
+msgid "Ecom IP: %(ecomIp)s Port: %(ecomPort)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:950
+msgid "Ecom server not found."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:957
+msgid "Cannot connect to ECOM server"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:969
+#, python-format
+msgid "Found Replication Service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:982
+#, python-format
+msgid "Found Storage Configuration Service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:995
+#, python-format
+msgid "Found Controller Configuration Service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1008
+#, python-format
+msgid "Found Storage Hardware ID Management Service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1052
+#, python-format
+msgid "Pool %(storage_type)s is not found."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1058
+#, python-format
+msgid "Storage system not found for pool %(storage_type)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1064
+#, python-format
+msgid "Pool: %(pool)s  SystemName: %(systemname)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1080
+#, python-format
+msgid "Pool name: %(poolname)s  System name: %(systemname)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1112
+#, python-format
+msgid "Volume %(volumename)s not found on the array."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1115
+#, python-format
+msgid "Volume name: %(volumename)s  Volume instance: %(vol_instance)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1128
+#, python-format
+msgid "Source: %(volumename)s  Target: %(snapshotname)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1151
+#, python-format
+msgid ""
+"Source: %(volumename)s  Target: %(snapshotname)s. Storage Synchronized "
+"not found. "
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1156
+#, python-format
+msgid ""
+"Storage system: %(storage_system)s  Storage Synchronized instance: "
+"%(sync)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1182
+#, python-format
+msgid "Error finding %s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1186
+#, python-format
+msgid "Found %(name)s: %(initiator)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1246
+#, python-format
+msgid ""
+"LunMaskingSCSIProtocolController for storage system %(storage_system)s "
+"and initiator %(initiator)s is  %(ctrl)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1287
+#, python-format
+msgid ""
+"LunMaskingSCSIProtocolController for storage volume %(vol)s and initiator"
+" %(initiator)s is  %(ctrl)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1300
+#, python-format
+msgid ""
+"Volume %(name)s not found on the array. Cannot determine if there are "
+"volumes mapped."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1312
+#, python-format
+msgid ""
+"LunMaskingSCSIProtocolController for storage system %(storage)s and "
+"%(connector)s is %(ctrl)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1324
+#, python-format
+msgid ""
+"Found %(numVolumesMapped)d volumes on storage system %(storage)s mapped "
+"to %(initiator)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1359
+#, python-format
+msgid "Available device number on %(storage)s: %(device)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1402
+#, python-format
+msgid "Device number not found for volume %(volumename)s %(vol_instance)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1407
+#, python-format
+msgid "Found device number %(device)d for volume %(volumename)s %(vol_instance)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1417
+#, python-format
+msgid "Device info: %(data)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1439
+#, python-format
+msgid "Masking view: %(view)s DeviceMaskingGroup: %(masking)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1461
+#, python-format
+msgid "Found Storage Processor System: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1489
+#, python-format
+msgid ""
+"iSCSIProtocolEndpoint for storage system %(storage_system)s and SP %(sp)s"
+" is  %(endpoint)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1518
+msgid "Error finding Storage Hardware ID Service."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1524
+#, python-format
+msgid ""
+"EMCGetTargetEndpoints: Service: %(service)s  Storage HardwareIDs: "
+"%(hardwareids)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1536
+msgid "Error finding Target WWNs."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1546
+#, python-format
+msgid "Add target WWN: %s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1548
+#, python-format
+msgid "Target WWNs: %s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_common.py:1564
+#, python-format
+msgid "Storage Hardware IDs for %(wwpns)s is %(foundInstances)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_iscsi.py:154
+#, python-format
+msgid "Could not find iSCSI export  for volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_iscsi.py:163
+#, python-format
+msgid "Cannot find device number for volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_iscsi.py:193
+#, python-format
+msgid "Found iSCSI endpoint: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_iscsi.py:200
+#, python-format
+msgid "ISCSI endpoint not found for SP %(sp)s on storage system %(storage)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_smis_iscsi.py:217
+#, python-format
+msgid "ISCSI properties: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:70
+#, python-format
+msgid "Range: start LU: %(start)s, end LU: %(end)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:84
+#, python-format
+msgid "setting LU uppper (end) limit to %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:92
+#, python-format
+msgid "%(element)s: %(val)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:103 cinder/volume/drivers/hds/hds.py:105
+#, python-format
+msgid "XML exception reading parameter: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:178
+#, python-format
+msgid "portal: %(ip)s:%(ipp)s, CTL: %(ctl)s, port: %(port)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:197
+#, python-format
+msgid "No configuration found for service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:250
+#, python-format
+msgid "HDP not found: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:289
+#, python-format
+msgid "iSCSI portal not found for service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:327
+#, python-format
+msgid "LUN %(lun)s of size %(sz)s MB is created."
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:355
+#, python-format
+msgid "LUN %(lun)s of size %(size)s MB is cloned."
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:372
+#, python-format
+msgid "LUN %(lun)s extended to %(size)s GB."
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:395
+#, python-format
+msgid "delete lun %(lun)s on %(name)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:480
+#, python-format
+msgid "LUN %(lun)s of size %(sz)s MB is created from snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:503
+#, python-format
+msgid "LUN %(lun)s of size %(size)s MB is created as snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:522
+#, python-format
+msgid "LUN %s is deleted."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/__init__.py:61
+msgid "_instantiate_driver: configuration not found."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/__init__.py:68
+#, python-format
+msgid ""
+"_instantiate_driver: Loading %(protocol)s driver for Huawei OceanStor "
+"%(product)s series storage arrays."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/__init__.py:88
+#, python-format
+msgid ""
+"\"Product\" or \"Protocol\" is illegal. \"Product\" should be set to "
+"either T, Dorado or HVS. \"Protocol\" should be set to either iSCSI or "
+"FC. Product: %(product)s Protocol: %(protocol)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_dorado.py:76
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"%(wwn)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_dorado.py:94
+#: cinder/volume/drivers/huawei/huawei_t.py:452
+#, python-format
+msgid "initialize_connection: Target FC ports WWNS: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:98
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(ini)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:155
+#: cinder/volume/drivers/huawei/rest_common.py:1265
+#, python-format
+msgid ""
+"_get_iscsi_params: Failed to get target IP for initiator %(ini)s, please "
+"check config file."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:202
+#: cinder/volume/drivers/huawei/rest_common.py:1075
+#, python-format
+msgid "_get_tgt_iqn: iSCSI IP is %s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:230
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:244
+#, python-format
+msgid ""
+"_get_iscsi_tgt_port_info: Failed to get iSCSI port info. Please make sure"
+" the iSCSI port IP %s is configured in array."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:319
+#: cinder/volume/drivers/huawei/huawei_t.py:543
+#, python-format
+msgid ""
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
+"%(initiator)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:346
+#, python-format
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:427
+msgid "validate_connector: The FC driver requires thewwpns in the connector."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/huawei_t.py:569
+#, python-format
+msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:59
+#, python-format
+msgid "HVS Request URL: %(url)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:60
+#, python-format
+msgid "HVS Request Data: %(data)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:73
+#, python-format
+msgid "HVS Response Data: %(res)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:75
+#, python-format
+msgid "Bad reponse from server: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:82
+msgid "JSON transfer Error"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:101
+#, python-format
+msgid "Login error, reason is %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:164
+#, python-format
+msgid ""
+"%(err)s\n"
+"result: %(res)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:178
+#, python-format
+msgid "create volume error: %(err)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:201
+msgid "Can't find the Qos policy in array"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:239
+msgid "Can't find lun or lun goup in array"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:269
+#, python-format
+msgid "_read_xml:%s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:284
+#, python-format
+msgid "Invalid resource pool: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:301
+#, python-format
+msgid "Get pool info error, pool name is:%s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:329
+#, python-format
+msgid "create_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:344
+msgid "Create snapshot error."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:356
+#, python-format
+msgid "_stop_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:445
+msgid "Create luncopy error."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:474
+#, python-format
+msgid ""
+"_mapping_hostgroup_and_lungroup: lun_group: %(lun_group)sview_id: "
+"%(view_id)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:512
+#: cinder/volume/drivers/huawei/rest_common.py:543
+#, python-format
+msgid "initiator name:%(initiator_name)s, volume name:%(volume)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:526
+#, python-format
+msgid "host lun id is %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:552
+#, python-format
+msgid "the free wwns %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:573
+#, python-format
+msgid "the fc server properties is:%s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:690
+msgid "_find_host_lun_id transfer data error! "
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:874
+#, python-format
+msgid "terminate_connection:volume name: %(volume)s, initiator name: %(ini)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:937
+#, python-format
+msgid ""
+"Config file is wrong. LUNType must be \"Thin\" or \"Thick\". "
+"LUNType:%(fetchtype)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:963
+#, python-format
+msgid ""
+"PrefetchType config is wrong. PrefetchType must in 1,2,3,4. fetchtype "
+"is:%(fetchtype)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:968
+msgid "Use default prefetch fetchtype. Prefetch fetchtype:Intelligent."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:980
+#, python-format
+msgid ""
+"_wait_for_luncopy:LUNcopy status is not normal.LUNcopy name: "
+"%(luncopyname)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1078
+#, python-format
+msgid "request ip info is %s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1081
+#, python-format
+msgid "new str info is %s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1122
+#, python-format
+msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1155
+#, python-format
+msgid ""
+"_parse_volume_type: Unacceptable paramater %(key)s. Please check this key"
+" in extra_specs and make it consistent with the configuration file "
+"%(conf)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1160
+#, python-format
+msgid "The config parameters are: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1240
+msgid ""
+"_check_conf_file: Config file invalid. HVSURL, UserName and UserPassword "
+"must be set."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_common.py:1246
+#: cinder/volume/drivers/huawei/ssh_common.py:136
+msgid "_check_conf_file: Config file invalid. StoragePool must be set."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:54
+#, python-format
+msgid "parse_xml_file: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:66
+msgid "ssh_read: Read SSH timeout."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:81
+msgid "No response message. Please check system status."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:127
+msgid ""
+"_check_conf_file: Config file invalid. Controler IP, UserName and "
+"UserPassword must be set."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:168
+#, python-format
+msgid "_get_login_info: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:214
+#, python-format
+msgid "create_volume: volume name: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:232
+#, python-format
+msgid ""
+"_name_translate: Name in cinder: %(old)s, new name in storage system: "
+"%(new)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:269
+#, python-format
+msgid ""
+"_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
+" in extra_specs and make it consistent with the element in configuration "
+"file %(conf)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
+#, python-format
+msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:384
+msgid ""
+"_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
+"Intelligent"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:410
+#, python-format
+msgid ""
+"_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
+" file and make sure the StoragePool %s is created in storage array."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:424
+#, python-format
+msgid "CLI command: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:454
+#, python-format
+msgid ""
+"_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
+"IP %(new)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:498
+#, python-format
+msgid "delete_volume: volume name: %s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:505
+#, python-format
+msgid "delete_volume: Volume %(name)s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:535
+#, python-format
+msgid ""
+"create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
+"%(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:545
+#, python-format
+msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:615
+#, python-format
+msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:653
+#, python-format
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:662
+#, python-format
+msgid "Source volume %(name)s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:700
+#, python-format
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:706
+msgid "create_snapshot: Resource pool needs 1GB valid size at least."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:713
+#, python-format
+msgid "create_snapshot: Volume %(name)s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:776
+#, python-format
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:786
+#, python-format
+msgid ""
+"delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
+"LUNCopy."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:794
+#, python-format
+msgid "delete_snapshot: Snapshot %(snap)s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:837
+#, python-format
+msgid ""
+"%(func)s: %(msg)s\n"
+"CLI command: %(cmd)s\n"
+"CLI out: %(out)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:987
+#, python-format
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
+#, python-format
+msgid "remove_map: Host %s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
+#, python-format
+msgid "remove_map: Volume %s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
+#, python-format
+msgid "remove_map: No map between host %(host)s and volume %(volume)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
+#, python-format
+msgid ""
+"_delete_map: There are IOs accessing the system. Retry to delete host map"
+" %(mapid)s 10s later."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
+#, python-format
+msgid ""
+"_delete_map: Failed to delete host map %(mapid)s.\n"
+"CLI out: %(out)s"
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
+msgid ""
+"Config file invalid. Controler IP, UserName, UserPassword must be "
+"specified."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
+msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
+msgid ""
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
+"now."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
+#, python-format
+msgid ""
+"create_volume_from_snapshot: %(device)s does not support create volume "
+"from snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
+#, python-format
+msgid "create_cloned_volume: %(device)s does not support clone volume."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
+#, python-format
+msgid "create_snapshot: %(device)s does not support snapshot."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/api.py:421
+#, python-format
+msgid "No element by given name %s."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/api.py:442
+msgid "Not a valid value for NaElement."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/api.py:446
+msgid "NaElement name cannot be null."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/api.py:470
+msgid "Type cannot be converted into NaElement."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:83
+msgid "Required configuration not found"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:111
+#, python-format
+msgid "Requested unified config: %(storage_family)s and %(storage_protocol)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:117
+#, python-format
+msgid "Storage family %s is not supported"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:124
+#, python-format
+msgid "No default storage protocol found for storage family %(storage_family)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:131
+#, python-format
+msgid ""
+"Protocol %(storage_protocol)s is not supported for storage family "
+"%(storage_family)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:138
+#, python-format
+msgid ""
+"NetApp driver of family %(storage_family)s and protocol "
+"%(storage_protocol)s loaded"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:147
+msgid "Only loading netapp drivers supported."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/common.py:166
+#, python-format
+msgid ""
+"The configured NetApp driver is deprecated. Please refer the link to "
+"resolve the issue '%s'."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:78
+#, python-format
+msgid "No metadata property %(prop)s defined for the LUN %(name)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:114
+#, python-format
+msgid "Using NetApp filer: %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:159
+msgid "Success getting LUN list from server"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:175
+#, python-format
+msgid "Created LUN with name %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:184
+#, python-format
+msgid "No entry in LUN table for volume/snapshot %(name)s."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:192
+#, python-format
+msgid "Destroyed LUN %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:229
+#, python-format
+msgid "Mapped LUN %(name)s to the initiator %(initiator_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:234
+#, python-format
+msgid ""
+"Succesfully fetched target details for LUN %(name)s and initiator "
+"%(initiator_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:240
+#, python-format
+msgid "Failed to get LUN target details for the LUN %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:251
+#, python-format
+msgid "Failed to get target portal for the LUN %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:254
+#, python-format
+msgid "Failed to get target IQN for the LUN %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:292
+#, python-format
+msgid "Snapshot %s deletion successful"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:304
+#: cinder/volume/drivers/netapp/nfs.py:97
+#, python-format
+msgid ""
+"Cannot create volume of size %(vol_size)s from snapshot of size "
+"%(snap_size)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:324
+#, python-format
+msgid "Unmapped LUN %(name)s from the initiator %(initiator_name)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:401
+#, python-format
+msgid "Error mapping lun. Code :%(code)s, Message:%(message)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:420
+#, python-format
+msgid "Error unmapping lun. Code :%(code)s, Message:%(message)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:500
+msgid "Object is not a NetApp LUN."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:516
+#, python-format
+msgid "Could not find attribute for LUN named %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:529
+#, python-format
+msgid ""
+"Cannot clone volume of size %(vol_size)s from src volume of size "
+"%(src_vol_size)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:583
+#, python-format
+msgid "Failed to get vol with required size and extra specs for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:599
+#, python-format
+msgid "Error provisioning vol %(name)s on %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:644
+#, python-format
+msgid "No iscsi service found for vserver %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:775
+#, python-format
+msgid "Cloned LUN with new name %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:779
+#, python-format
+msgid "No clonned lun named %s found on the filer"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:873
+msgid "Cluster ssc is not updated. No volume stats found."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:918
+#, python-format
+msgid "Failed to get vol with required size for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:1037
+#, python-format
+msgid "Error finding luns for volume %s. Verify volume exists."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:1142
+#, python-format
+msgid "Clone operation with src %(name)s and dest %(new_name)s completed"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/iscsi.py:1145
+#, python-format
+msgid "Clone operation with src %(name)s and dest %(new_name)s failed"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:195
+#, python-format
+msgid ""
+"Cannot create clone of size %(vol_size)s from volume of size "
+"%(src_vol_size)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:214
+#, python-format
+msgid "Copied image to volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:220
+#, python-format
+msgid "Registering image in cache %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:227
+#, python-format
+msgid ""
+"Exception while registering image %(image_id)s in cache. Exception: "
+"%(exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:240
+#, python-format
+msgid "Found cache file for image %(image_id)s on share %(share)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:253
+#, python-format
+msgid "Cloning img from cache for %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:261
+msgid "Image cache cleaning in progress. Returning... "
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:272
+msgid "Image cache cleaning in progress."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:283
+#, python-format
+msgid "Cleaning cache for share %s."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:288
+#, python-format
+msgid "Files to be queued for deletion %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:295
+#, python-format
+msgid "Exception during cache cleaning %(share)s. Message - %(ex)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:301
+msgid "Image cache cleaning done."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:326
+#, python-format
+msgid "Bytes to free %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:333
+#, python-format
+msgid "Delete file path %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:348
+#, python-format
+msgid "Deleting file at path %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:353
+#, python-format
+msgid "Exception during deleting %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:385
+#, python-format
+msgid "Unexpected exception in cloning image %(image_id)s. Message: %(msg)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:401
+#, python-format
+msgid "Cloning image %s from cache"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:405
+#, python-format
+msgid "Cache share: %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:415
+#, python-format
+msgid "Unexpected exception during image cloning in share %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:421
+#, python-format
+msgid "Cloning image %s directly in share"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:426
+#, python-format
+msgid "Share is cloneable %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:433
+#, python-format
+msgid "Image is raw %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:440
+#, python-format
+msgid "Image will locally be converted to raw %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:447
+#, python-format
+msgid "Converted to raw, but format is now %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:457
+#, python-format
+msgid "Performing post clone for %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:464
+msgid "NFS file could not be discovered."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:468
+msgid "Checking file for resize"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:472
+#, python-format
+msgid "Resizing file to %sG"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:478
+msgid "Resizing image file failed."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:500
+msgid "Discover file retries exhausted."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:519
+#, python-format
+msgid "Image location not in the expected format %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:547
+#, python-format
+msgid "Found possible share matches %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:551
+msgid "Unexpected exception while short listing used share."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:685
+#, python-format
+msgid "Shares on vserver %s will only be used for provisioning."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:690
+#: cinder/volume/drivers/netapp/nfs.py:893
+msgid "No vserver set in config. SSC will be disabled."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:731
+#, python-format
+msgid "Exception creating vol %(name)s on share %(share)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:739
+#, python-format
+msgid "Volume %s could not be created on shares."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:789
+#, python-format
+msgid "No interface found on cluster for ip %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:830
+#, python-format
+msgid ""
+"No volume on cluster with vserver\n"
+"                                   %(vserver)s and junction path "
+"%(junction)s\n"
+"                                   "
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:836
+#, python-format
+msgid ""
+"Cloning with params volume %(volume)s, src %(src_path)s,\n"
+"                    dest %(dest_path)s, vserver %(vserver)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:888
+msgid "No cluster ssc stats found. Wait for next volume stats update."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:909
+msgid "No shares found hence skipping ssc refresh."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:946
+#: cinder/volume/drivers/netapp/nfs.py:1132
+#, python-format
+msgid "Shortlisted del elg files %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:951
+#: cinder/volume/drivers/netapp/nfs.py:1137
+#, python-format
+msgid "Getting file usage for %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:956
+#: cinder/volume/drivers/netapp/nfs.py:1142
+#, python-format
+msgid "file-usage for path %(path)s is %(bytes)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:973
+#: cinder/volume/drivers/netapp/nfs.py:1179
+#, python-format
+msgid "Share match found for ip %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:975
+#: cinder/volume/drivers/netapp/nfs.py:1181
+#, python-format
+msgid "No share match found for ip %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:1040
+#, python-format
+msgid "No storage path found for export path %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/nfs.py:1050
+#, python-format
+msgid "Cloning with src %(src_path)s, dest %(dest_path)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/ssc_utils.py:238
+#, python-format
+msgid "Unexpected error while creating ssc vol list. Message - %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/ssc_utils.py:375
+#, python-format
+msgid "Running stale ssc refresh job for %(server)s and vserver %(vs)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/ssc_utils.py:433
+#, python-format
+msgid "Running cluster latest ssc job for %(server)s and vserver %(vs)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/ssc_utils.py:448
+msgid "Backend not a VolumeDriver."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/ssc_utils.py:450
+msgid "Backend server not NaServer."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/ssc_utils.py:453
+msgid "ssc job in progress. Returning... "
+msgstr ""
+
+#: cinder/volume/drivers/netapp/ssc_utils.py:462
+msgid "refresh stale ssc job in progress. Returning... "
+msgstr ""
+
+#: cinder/volume/drivers/netapp/utils.py:112
+msgid "ems executed successfully."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/utils.py:114
+#, python-format
+msgid "Failed to invoke ems. Message : %s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/utils.py:125
+msgid ""
+"It is not the recommended way to use drivers by NetApp. Please use "
+"NetAppDriver to achieve the functionality."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/utils.py:148
+msgid "Requires an NaServer instance."
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/jsonrpc.py:64
+#, python-format
+msgid "Sending JSON data: %s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/jsonrpc.py:69
+#, python-format
+msgid "Auto switching to HTTPS connection to %s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/jsonrpc.py:75
+msgid "No headers in server response"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/jsonrpc.py:76
+msgid "Bad response from server"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/jsonrpc.py:79
+#, python-format
+msgid "Got response: %s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:76
+#, python-format
+msgid "Volume %s does not exist in Nexenta Store appliance"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:80
+#, python-format
+msgid "Folder %s does not exist in Nexenta Store appliance"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:104
+#, python-format
+msgid "Creating folder on Nexenta Store %s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:136
+#, python-format
+msgid "Cannot destroy created folder: %(vol)s/%(folder)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:166
+#, python-format
+msgid "Cannot destroy cloned folder: %(vol)s/%(folder)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:189
+#, python-format
+msgid "Volume creation failed, deleting created snapshot %(volume_name)s@%(name)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:194
+#, python-format
+msgid "Failed to delete zfs snapshot %(volume_name)s@%(name)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:257
+#, python-format
+msgid "Creating regular file: %s.This may take some time."
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:268
+#, python-format
+msgid "Regular file: %s created."
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:309
+#, python-format
+msgid "Sharing folder %s on Nexenta Store"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/nfs.py:337
+#, python-format
+msgid "Shares loaded: %s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/utils.py:37
+#, python-format
+msgid "Invalid value: \"%s\""
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:80
+#, python-format
+msgid "Volume %s does not exist in Nexenta SA"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:119
+#, python-format
+msgid "Extending volume: %(id)s New size: %(size)s GB"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:133
+#, python-format
+msgid "Volume %s does not exist, it seems it was already deleted"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:148
+#, python-format
+msgid "Creating temp snapshot of the original volume: %(volume_name)s@%(name)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:157
+msgid "Executing zfs send/recv on the appliance"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:159
+#, python-format
+msgid "zfs send/recv done, new volume %s created"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:166
+#, python-format
+msgid "Failed to delete temp snapshot %(volume)s@%(snapshot)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:175
+#, python-format
+msgid "Failed to delete zfs recv snapshot %(volume)s@%(snapshot)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:325
+#: cinder/volume/drivers/windows/windows_utils.py:232
+#, python-format
+msgid "Ignored target creation error \"%s\" while ensuring export"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:335
+#, python-format
+msgid "Ignored target group creation error \"%s\" while ensuring export"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:347
+#, python-format
+msgid "Ignored target group member addition error \"%s\" while ensuring export"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:357
+#, python-format
+msgid "Ignored LU creation error \"%s\" while ensuring export"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:367
+#, python-format
+msgid "Ignored LUN mapping entry addition error \"%s\" while ensuring export"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:400
+#, python-format
+msgid ""
+"Got error trying to destroy target group %(target_group)s, assuming it is"
+" already gone: %(exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/nexenta/volume.py:408
+#, python-format
+msgid ""
+"Got error trying to delete target %(target)s, assuming it is already "
+"gone: %(exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp_lefthand.py:93
+#, python-format
+msgid "CLIQ command returned %s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp_lefthand.py:99
+#, python-format
+msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp_lefthand.py:107
+#, python-format
+msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp_lefthand.py:137
+#, python-format
+msgid ""
+"Unexpected number of virtual ips for cluster  %(cluster_name)s. "
+"Result=%(_xml)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp_lefthand.py:190
+#, python-format
+msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp_lefthand.py:246
+#, python-format
+msgid "Snapshot info: %(name)s => %(attributes)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp_lefthand.py:321
+msgid "local_path not supported"
+msgstr ""
+
+#: cinder/volume/drivers/san/san.py:171
+msgid "Specify san_password or san_private_key"
+msgstr ""
+
+#: cinder/volume/drivers/san/san.py:175
+msgid "san_ip must be set"
+msgstr ""
+
+#: cinder/volume/drivers/san/solaris.py:79
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: cinder/volume/drivers/san/solaris.py:174
+#, python-format
+msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:149
+msgid ""
+"hp3par_domain has been deprecated and is no longer used. The domain is "
+"automatically looked up based on the CPG."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:166
+#, python-format
+msgid "Invalid hp3parclient version. Version %s or greater required."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:180
+msgid "Login to 3PAR array invalid"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:189
+#, python-format
+msgid "HP3PARCommon %(common_ver)s, hp3parclient %(rest_ver)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:208
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:480
+#, python-format
+msgid "CPG (%s) doesn't exist on array"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
+#, python-format
+msgid "Failed to get domain because CPG (%s) doesn't exist on array."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:243
+#, python-format
+msgid "Error extending volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:383
+#, python-format
+msgid "Error running ssh command: %s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:566
+#, python-format
+msgid "VV Set %s does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:613
+#, python-format
+msgid "Must specify a valid persona %(valid)s, value '%(persona)s' is invalid."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:663
+#, python-format
+msgid ""
+"Must specify a valid provisioning type %(valid)s, value '%(prov)s' is "
+"invalid."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:729
+#, python-format
+msgid "Volume (%s) already exists on array"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
+#, python-format
+msgid "Invalid IP address format '%s'"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
+#, python-format
+msgid ""
+"Found invalid iSCSI IP address(s) in configuration option(s) "
+"hp3par_iscsi_ips or iscsi_ip_address '%s.'"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
+msgid "At least one valid iSCSI IP address must be set."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
+msgid "Least busy iSCSI port not found, using first iSCSI port in list."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:75
+#, python-format
+msgid "Failure while invoking function: %(func)s. Error: %(excep)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:162
+#, python-format
+msgid "Error while terminating session: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:165
+msgid "Successfully established connection to the server."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:172
+#, python-format
+msgid "Error while logging out the user: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:218
+#, python-format
+msgid ""
+"Not authenticated error occurred. Will create session and try API call "
+"again: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:258
+#, python-format
+msgid "Task: %(task)s progress: %(prog)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:262
+#, python-format
+msgid "Task %s status: success."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/api.py:266
+#: cinder/volume/drivers/vmware/api.py:271
+#, python-format
+msgid "Task: %(task)s failed with error: %(err)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/io_util.py:116
+#, python-format
+msgid "Glance image: %s is in killed state."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/io_util.py:125
+#, python-format
+msgid "Glance image %(id)s is in unknown state - %(state)s"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/read_write_util.py:157
+#, python-format
+msgid ""
+"Exception during HTTP connection close in VMwareHTTPWrite. Exception is "
+"%s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vim.py:151
+#, python-format
+msgid "Error(s): %s occurred in the call to RetrieveProperties."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vim.py:189
+#, python-format
+msgid "No such SOAP method %(attr)s. Detailed error: %(excep)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vim.py:198
+#, python-format
+msgid "httplib error in %(attr)s: %(excep)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vim.py:209
+#, python-format
+msgid "Socket error in %(attr)s: %(excep)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vim.py:218
+#, python-format
+msgid "Type error in %(attr)s: %(excep)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vim.py:225
+#, python-format
+msgid "Error in %(attr)s. Detailed error: %(excep)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:99
+#, python-format
+msgid "Returning spec value %s"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:102
+#, python-format
+msgid "Invalid spec value: %s specified."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:105
+#, python-format
+msgid "Returning default spec value: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:154
+#, python-format
+msgid "%s not set."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:158
+#, python-format
+msgid "Successfully setup driver: %(driver)s for server: %(ip)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:203
+msgid "Backing not available, no operation to be performed."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:245
+#, python-format
+msgid ""
+"Unable to pick datastore to accomodate %(size)s bytes from the "
+"datastores: %(dss)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:252
+#, python-format
+msgid "Selected datastore: %s for the volume."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:322
+msgid "There are no hosts in the inventory."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:333
+#, python-format
+msgid ""
+"Unable to find suitable datastore for volume: %(vol)s under host: "
+"%(host)s. More details: %(excep)s"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:339
+#, python-format
+msgid "Unable to create volume: %(vol)s on the hosts: %(hosts)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:359
+#, python-format
+msgid "The instance: %s for which initialize connection is called, exists."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:366
+#, python-format
+msgid "There is no backing for the volume: %s. Need to create one."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:374
+msgid "The instance for which initialize connection is called, does not exist."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:379
+#, python-format
+msgid "Trying to boot from an empty volume: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:388
+#, python-format
+msgid ""
+"Returning connection_info: %(info)s for volume: %(volume)s with "
+"connector: %(connector)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:434
+#, python-format
+msgid "There is no backing, so will not create snapshot: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:439
+#, python-format
+msgid "Successfully created snapshot: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:458
+#, python-format
+msgid "There is no backing, and so there is no snapshot: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:462
+#, python-format
+msgid "Successfully deleted snapshot: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:502
+#, python-format
+msgid "Successfully cloned new backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:519
+#, python-format
+msgid ""
+"There is no backing for the source volume: %(svol)s. Not creating any "
+"backing for the volume: %(vol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:548
+#, python-format
+msgid ""
+"There is no backing for the source snapshot: %(snap)s. Not creating any "
+"backing for the volume: %(vol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:557
+#: cinder/volume/drivers/vmware/vmdk.py:829
+#, python-format
+msgid ""
+"There is no snapshot point for the snapshoted volume: %(snap)s. Not "
+"creating any backing for the volume: %(vol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:566
+#, python-format
+msgid "Successfully reverted clone: %(clone)s to snapshot: %(snapshot)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:598
+#, python-format
+msgid "Cannot create image of disk format: %s. Only vmdk disk format is accepted."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:615
+#, python-format
+msgid "Copy glance image: %s to create new volume."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:642
+#, python-format
+msgid "Fetching glance image: %(id)s to server: %(host)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:650
+#, python-format
+msgid "Done copying image: %(id)s to volume: %(vol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:653
+#, python-format
+msgid ""
+"Exception in copy_image_to_volume: %(excep)s. Deleting the backing: "
+"%(back)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:676
+#, python-format
+msgid "Copy Volume: %s to new image."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:681
+#, python-format
+msgid "Backing not found, creating for volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:716
+#, python-format
+msgid "Done copying volume %(vol)s to a new image %(img)s"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:769
+#, python-format
+msgid "Relocating volume: %(backing)s to %(ds)s and %(rp)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:808
+#: cinder/volume/drivers/vmware/volumeops.py:530
+#, python-format
+msgid "Successfully created clone: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:821
+#, python-format
+msgid ""
+"There is no backing for the snapshoted volume: %(snap)s. Not creating any"
+" backing for the volume: %(vol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmdk.py:855
+#, python-format
+msgid ""
+"There is no backing for the source volume: %(src)s. Not creating any "
+"backing for volume: %(vol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmware_images.py:96
+#, python-format
+msgid "Downloading image: %s from glance image server."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmware_images.py:109
+#, python-format
+msgid "Downloaded image: %s from glance image server."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmware_images.py:115
+#, python-format
+msgid "Uploading image: %s to the Glance image server."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/vmware_images.py:135
+#, python-format
+msgid "Uploaded image: %s to the Glance image server."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:79
+#, python-format
+msgid "Did not find any backing with name: %s"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:86
+#, python-format
+msgid "Deleting the VM backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:89
+#, python-format
+msgid "Initiated deletion of VM backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:91
+#, python-format
+msgid "Deleted the VM backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:139
+#, python-format
+msgid "There are no datastores present under %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:190
+#, python-format
+msgid ""
+"Creating folder: %(child_folder_name)s under parent folder: "
+"%(parent_folder)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:207
+#, python-format
+msgid "Child folder already present: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:215
+#, python-format
+msgid "Created child folder: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:265
+#, python-format
+msgid "Spec for creating the backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:283
+#, python-format
+msgid ""
+"Creating volume backing name: %(name)s disk_type: %(disk_type)s size_kb: "
+"%(size_kb)s at folder: %(folder)s resourse pool: %(resource_pool)s "
+"datastore name: %(ds_name)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:295
+#, python-format
+msgid "Initiated creation of volume backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:298
+#, python-format
+msgid "Successfully created volume backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:338
+#, python-format
+msgid "Spec for relocating the backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:352
+#, python-format
+msgid ""
+"Relocating backing: %(backing)s to datastore: %(ds)s and resource pool: "
+"%(rp)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:362
+#, python-format
+msgid "Initiated relocation of volume backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:364
+#, python-format
+msgid ""
+"Successfully relocated volume backing: %(backing)s to datastore: %(ds)s "
+"and resource pool: %(rp)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:374
+#, python-format
+msgid "Moving backing: %(backing)s to folder: %(fol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:379
+#, python-format
+msgid "Initiated move of volume backing: %(backing)s into the folder: %(fol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:382
+#, python-format
+msgid "Successfully moved volume backing: %(backing)s into the folder: %(fol)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:394
+#, python-format
+msgid "Snapshoting backing: %(backing)s with name: %(name)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:401
+#, python-format
+msgid "Initiated snapshot of volume backing: %(backing)s named: %(name)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:405
+#, python-format
+msgid "Successfully created snapshot: %(snap)s for volume backing: %(backing)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:453
+#, python-format
+msgid "Deleting the snapshot: %(name)s from backing: %(backing)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:458
+#, python-format
+msgid ""
+"Did not find the snapshot: %(name)s for backing: %(backing)s. Need not "
+"delete anything."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:465
+#, python-format
+msgid "Initiated snapshot: %(name)s deletion for backing: %(backing)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:469
+#, python-format
+msgid "Successfully deleted snapshot: %(name)s of backing: %(backing)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:497
+#, python-format
+msgid "Spec for cloning the backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:513
+#, python-format
+msgid ""
+"Creating a clone of backing: %(back)s, named: %(name)s, clone type: "
+"%(type)s from snapshot: %(snap)s on datastore: %(ds)s"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:527
+#, python-format
+msgid "Initiated clone of backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:538
+#, python-format
+msgid "Deleting file: %(file)s under datacenter: %(dc)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:546
+#, python-format
+msgid "Initiated deletion via task: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:548
+#, python-format
+msgid "Successfully deleted file: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:559
+#, python-format
+msgid "Copying backing files from %(src)s to %(dest)s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:568
+#, python-format
+msgid "Initiated copying of backing via task: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:570
+#, python-format
+msgid "Successfully copied backing to %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:600
+#, python-format
+msgid "Registering backing at path: %s to inventory."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:607
+#, python-format
+msgid "Initiated registring backing, task: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:610
+#, python-format
+msgid "Successfully registered backing: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:625
+#, python-format
+msgid "Reverting backing to snapshot: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:629
+#, python-format
+msgid "Initiated reverting snapshot via task: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:631
+#, python-format
+msgid "Successfully reverted to snapshot: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:674
+msgid "Copying disk data before snapshot of the VM"
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:684
+#, python-format
+msgid "Initiated copying disk data via task: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:686
+#, python-format
+msgid "Successfully copied disk data to: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:695
+#, python-format
+msgid "Deleting vmdk file: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:702
+#, python-format
+msgid "Initiated deleting vmdk file via task: %s."
+msgstr ""
+
+#: cinder/volume/drivers/vmware/volumeops.py:704
+#, python-format
+msgid "Deleted vmdk file: %s."
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows.py:104
+#, python-format
+msgid "Creating folder %s "
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:49
+#, python-format
+msgid ""
+"check_for_setup_error: the state of the WT Portal could not be verified. "
+"WMI exception: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:55
+msgid "check_for_setup_error: there is no ISCSI traffic listening."
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:65
+#, python-format
+msgid ""
+"get_host_information: the state of the WT Portal could not be verified. "
+"WMI exception: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:75
+#, python-format
+msgid ""
+"get_host_information: the ISCSI target information could not be "
+"retrieved. WMI exception: %s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:107
+#, python-format
+msgid ""
+"associate_initiator_with_iscsi_target: an association between initiator: "
+"%(init)s and target name: %(target)s could not be established. WMI "
+"exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:125
+#, python-format
+msgid ""
+"delete_iscsi_target: error when deleting the iscsi target associated with"
+" target name: %(target)s . WMI exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:141
+#, python-format
+msgid ""
+"create_volume: error when creating the volume name: %(vol_name)s . WMI "
+"exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:159
+#, python-format
+msgid ""
+"delete_volume: error when deleting the volume name: %(vol_name)s . WMI "
+"exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:179
+#, python-format
+msgid ""
+"create_snapshot: error when creating the snapshot name: %(vol_name)s . "
+"WMI exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:195
+#, python-format
+msgid ""
+"create_volume_from_snapshot: error when creating the volume name: "
+"%(vol_name)s from snapshot name: %(snap_name)s. WMI exception: "
+"%(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:210
+#, python-format
+msgid ""
+"delete_snapshot: error when deleting the snapshot name: %(snap_name)s . "
+"WMI exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:225
+#, python-format
+msgid ""
+"create_iscsi_target: error when creating iscsi target: %(tar_name)s . WMI"
+" exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:242
+#, python-format
+msgid ""
+"remove_iscsi_target: error when deleting iscsi target: %(tar_name)s . WMI"
+" exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:257
+#, python-format
+msgid ""
+"add_disk_to_target: error adding disk associated to volume : %(vol_name)s"
+" to the target name: %(tar_name)s . WMI exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:275
+#, python-format
+msgid ""
+"copy_vhd_disk: error when copying disk from source path : %(src_path)s to"
+" destination path: %(dest_path)s . WMI exception: %(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/drivers/windows/windows_utils.py:292
+#, python-format
+msgid ""
+"extend: error when extending the volumne: %(vol_name)s .WMI exception: "
+"%(wmi_exc)s"
+msgstr ""
+
+#: cinder/volume/flows/utils.py:38
+#, python-format
+msgid "%(flow)s has moved into state %(state)s from state %(old_state)s"
+msgstr ""
+
+#: cinder/volume/flows/utils.py:45
+#, python-format
+msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:108
+#, python-format
+msgid "Restoring source %(source_volid)s status to %(status)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:114
+#, python-format
+msgid ""
+"Failed setting source volume %(source_volid)s back to its initial "
+"%(source_status)s status"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:139
+#, python-format
+msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
+#, python-format
+msgid "Failed updating volume %(volume_id)s with %(update)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:209
+#, python-format
+msgid "Originating snapshot status must be one of %s values"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:231
+#, python-format
+msgid ""
+"Unable to create a volume from an originating source volume when its "
+"status is not one of %s values"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:254
+#, python-format
+msgid ""
+"Volume size %(size)s cannot be lesser than the snapshot size "
+"%(snap_size)s. They must be >= original snapshot size."
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:263
+#, python-format
+msgid ""
+"Clones currently disallowed when %(size)s < %(source_size)s. They must be"
+" >= original volume size."
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:272
+#, python-format
+msgid "Volume size %(size)s must be an integer and greater than 0"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:314
+#, python-format
+msgid ""
+"Size of specified image %(image_size)s is larger than volume size "
+"%(volume_size)s."
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:322
+#, python-format
+msgid ""
+"Image minDisk size %(min_disk)s is larger than the volume size "
+"%(volume_size)s."
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:340
+#, python-format
+msgid "Metadata property key %s greater than 255 characters"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:345
+#, python-format
+msgid "Metadata property key %s value greater than 255 characters"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:382
+#, python-format
+msgid "Availability zone '%s' is invalid"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:395
+msgid "Volume must be in the same availability zone as the snapshot"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:404
+msgid "Volume must be in the same availability zone as the source volume"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:443
+msgid "Volume type will be changed to be the same as the source volume."
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:585
+#, python-format
+msgid "Failed destroying volume entry %s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:662
+#, python-format
+msgid "Failed rolling back quota for %s reservations"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
+#, python-format
+msgid "Volume %s: create failed"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
+msgid "Unexpected build error:"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:884
+#, python-format
+msgid ""
+"Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
+"%(reason)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:902
+#, python-format
+msgid "Volume %s: re-scheduled"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:919
+#, python-format
+msgid "Updating volume %(volume_id)s with %(update)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:924
+#, python-format
+msgid "Volume %s: resetting 'creating' status failed"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:941
+#, python-format
+msgid ""
+"Failing volume %s creation by altering volume status instead of "
+"rescheduling"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:956
+#, python-format
+msgid "Volume %s: rescheduling failed"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
+#, python-format
+msgid "Failed notifying on %(topic)s payload %(payload)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1029
+msgid "No volume_id provided to populate a request_spec from"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1183
+#, python-format
+msgid ""
+"Failed notifying about the volume action %(event)s for volume "
+"%(volume_id)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1219
+#, python-format
+msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1221
+#, python-format
+msgid ""
+"Failed updating volume %(vol_id)s metadata using the provided "
+"%(src_type)s %(src_id)s metadata"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1279
+#, python-format
+msgid ""
+"Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
+" glance snapshot %(snapshot_ref_id)s volume reference"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1292
+#, python-format
+msgid "Marking volume %s as bootable"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1295
+#, python-format
+msgid "Failed updating volume %(volume_id)s bootable flag to true"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1322
+#, python-format
+msgid ""
+"Attempting download of %(image_id)s (%(image_location)s) to volume "
+"%(volume_id)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
+#, python-format
+msgid ""
+"Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
+"%(error)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1335
+#, python-format
+msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1349
+#, python-format
+msgid ""
+"Downloaded image %(image_id)s (%(image_location)s) to volume "
+"%(volume_id)s successfully"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1386
+#, python-format
+msgid ""
+"Creating volume glance metadata for volume %(volume_id)s backed by image "
+"%(image_id)s with: %(vol_metadata)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1400
+#, python-format
+msgid ""
+"Cloning %(volume_id)s from image %(image_id)s  at location "
+"%(image_location)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1426
+#, python-format
+msgid "Failed updating volume %(volume_id)s with %(updates)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1451
+#, python-format
+msgid ""
+"Volume %(volume_id)s: being created using %(functor)s with specification:"
+" %(volume_spec)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1474
+#, python-format
+msgid ""
+"Failed updating model of volume %(volume_id)s with creation provided "
+"model %(model)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1482
+#, python-format
+msgid "Volume %s: creating export"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1496
+#, python-format
+msgid ""
+"Failed updating model of volume %(volume_id)s with driver provided model "
+"%(model)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1542
+#, python-format
+msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1632
+#, python-format
+msgid "Failed to schedule_create_volume: %(cause)s"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1707
+msgid "No request spec, will not reschedule"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1710
+msgid "No retry filter property or associated retry info, will not reschedule"
+msgstr ""
+
+#: cinder/volume/flows/create_volume/__init__.py:1731
+msgid "Retry info not present, will not reschedule"
+msgstr ""
+
+#~ msgid "Connection to glance failed"
+#~ msgstr ""
+
+#~ msgid "Invalid snapshot"
+#~ msgstr ""
+
+#~ msgid "Invalid source volume %(reason)s."
+#~ msgstr ""
+
+#~ msgid "The request is invalid."
+#~ msgstr ""
+
+#~ msgid "Invalid input received"
+#~ msgstr ""
+
+#~ msgid "Invalid volume type"
+#~ msgstr ""
+
+#~ msgid "Invalid volume"
+#~ msgstr ""
+
+#~ msgid "Invalid host"
+#~ msgstr ""
+
+#~ msgid "Invalid auth key"
+#~ msgstr ""
+
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
+#~ msgstr ""
+
+#~ msgid "Invalid metadata"
+#~ msgstr ""
+
+#~ msgid "Invalid metadata size"
+#~ msgstr ""
+
+#~ msgid "No disk at %(location)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
+#~ msgstr ""
+
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
+#~ msgstr ""
+
+#~ msgid "Action not allowed."
+#~ msgstr ""
+
+#~ msgid "Key pair %(key_name)s already exists."
+#~ msgstr ""
+
+#~ msgid "Migration error"
+#~ msgstr ""
+
+#~ msgid "Quota exceeded"
+#~ msgstr ""
+
+#~ msgid "Maximum volume/snapshot size exceeded"
+#~ msgstr ""
+
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
+#~ msgstr ""
+
+#~ msgid "Backup volume %(volume_id)s type not recognised."
+#~ msgstr ""
+
+#~ msgid "Connection to swift failed"
+#~ msgstr ""
+
+#~ msgid "Volume migration failed"
+#~ msgstr ""
+
+#~ msgid "SSH command injection detected"
+#~ msgstr ""
+
+#~ msgid "Invalid qos specs"
+#~ msgstr ""
+
+#~ msgid "base image still has %s snapshots so not deleting base image"
+#~ msgstr ""
+
+#~ msgid "Resize volume \"%(name)s\" to %(size)s"
+#~ msgstr ""
+
+#~ msgid "Volume \"%(name)s\" resized. New size is %(size)s"
+#~ msgstr ""
+
+#~ msgid "Invalid snapshot backing file format: %s"
+#~ msgstr ""
+
+#~ msgid "Extend volume from %(old_size) to %(new_size)"
+#~ msgstr ""
+
+#~ msgid "Disk not found: %s"
+#~ msgstr ""
+
+#~ msgid "read timed out"
+#~ msgstr ""
+
+#~ msgid "do_setup."
+#~ msgstr ""
+
+#~ msgid "check_for_setup_error."
+#~ msgstr ""
+
+#~ msgid "check_for_setup_error: Can not get device type."
+#~ msgstr ""
+
+#~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "check_for_setup_error: Product version not "
+#~ "right. Please make sure the product "
+#~ "version is V1."
+#~ msgstr ""
+
+#~ msgid "_get_device_type: Storage Pool must be configured."
+#~ msgstr ""
+
+#~ msgid "create_volume:volume name: %s."
+#~ msgstr ""
+
+#~ msgid "delete_volume: volume name: %s."
+#~ msgstr ""
+
+#~ msgid "delete_volume:No need to delete volume. Volume %(name)s does not exist."
+#~ msgstr ""
+
+#~ msgid "create_export: volume name:%s"
+#~ msgstr ""
+
+#~ msgid "create_export:Volume %(name)s does not exist."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "initialize_connection: volume name: %(volume)s. "
+#~ "initiator name: %(ini)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "initialize_connection:Failed to find target ip"
+#~ " for initiator:%(initiatorname)s, please check"
+#~ " config file."
+#~ msgstr ""
+
+#~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "initialize_connection:host name: %(host)s, initiator"
+#~ " name: %(ini)s, hostport name: %(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "initialize_connection:Failed to find the given"
+#~ " volume. volume name:%(volume)s."
+#~ msgstr ""
+
+#~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
+#~ msgstr ""
+
+#~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "terminate_connection:No map between host and"
+#~ " volume. Host name:%(hostname)s, volume "
+#~ "name:%(volumename)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "terminate_connection:No initiator is added to"
+#~ " the host. Host name:%(hostname)s"
+#~ msgstr ""
+
+#~ msgid "create_snapshot:Device does not support snapshot."
+#~ msgstr ""
+
+#~ msgid "create_snapshot:Resource pool needs 1GB valid size at least."
+#~ msgstr ""
+
+#~ msgid "create_snapshot:Volume does not exist. Volume name:%(name)s"
+#~ msgstr ""
+
+#~ msgid "create_snapshot:Snapshot does not exist. Snapshot name:%(name)s"
+#~ msgstr ""
+
+#~ msgid "delete_snapshot:snapshot name:%(snapshot)s, volume name:%(volume)s."
+#~ msgstr ""
+
+#~ msgid "delete_snapshot:Device does not support snapshot."
+#~ msgstr ""
+
+#~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
+#~ "volume name:%(volume)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "create_volume_from_snapshot:Device does not support"
+#~ " create volume from snapshot. Volume "
+#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "create_volume_from_snapshot:Snapshot does not exist."
+#~ " Snapshot name:%(name)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Config file is wrong. Controler IP, "
+#~ "UserName and UserPassword must be set."
+#~ msgstr ""
+
+#~ msgid "_check_conf_file: %s"
+#~ msgstr ""
+
+#~ msgid "Write login information to xml error. %s"
+#~ msgstr ""
+
+#~ msgid "_get_login_info error. %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Config file is wrong. LUNType must "
+#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgstr ""
+
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_lun_set_info:No available pools! Please "
+#~ "check whether storage pool is created."
+#~ msgstr ""
+
+#~ msgid "_get_lun_set_info:%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_maximum_pool:maxpoolid is None. Please "
+#~ "check config file and make sure "
+#~ "the \"Name\" in \"StoragePool\" is "
+#~ "right."
+#~ msgstr ""
+
+#~ msgid "_get_iscsi_info:%s"
+#~ msgstr ""
+
+#~ msgid "CLI command:%s"
+#~ msgstr ""
+
+#~ msgid "_execute_cli:%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_name_translate:Name in cinder: %(old)s, new"
+#~ " name in storage system: %(new)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_create_hostgroup:Failed to Create hostgroup. "
+#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_add_host:Failed to add host to "
+#~ "hostgroup. host name:%(host)s hostgroup "
+#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_add_initiator:Failed to add initiator. "
+#~ "initiator name:%(name)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_delete_initiator:ERROE:Failed to delete initiator."
+#~ " initiator name:%(name)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_add_hostport:Failed to add hostport. port "
+#~ "name:%(port)s port information:%(info)s host "
+#~ "id:%(host)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgstr ""
+
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgstr ""
+
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_map_lun:Failed to add hostmap. "
+#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
+#~ "out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_delete_map:There are IOs accessing the "
+#~ "system. Retry to delete host map. "
+#~ "map id:%(mapid)s"
+#~ msgstr ""
+
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_active_snapshot:Failed to active snapshot. "
+#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_disable_snapshot:Failed to disable snapshot. "
+#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_delete_snapshot:Failed to delete snapshot. "
+#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_create_volume:Failed to Create volume. volume"
+#~ " name:%(name)s. out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_delete_volume:Failed to delete volume. Volume"
+#~ " name:%(name)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_create_luncopy:Failed to Create LUNcopy. "
+#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_start_luncopy:Failed to start LUNcopy. "
+#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_wait_for_luncopy:LUNcopy status is not "
+#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_delete_luncopy:Failed to delete LUNcopy. "
+#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_create_snapshot:Failed to Create snapshot. "
+#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_change_lun_controller:Failed to change lun "
+#~ "owning controller. lun id:%(lunid)s. new "
+#~ "controller:%(controller)s. out:%(out)s"
+#~ msgstr ""
+
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
+#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ msgstr ""
+
diff --git a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
index d910f90db..30eaad118 100644
--- a/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
+++ b/cinder/locale/bg_BG/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/bs/LC_MESSAGES/cinder.po b/cinder/locale/bs/LC_MESSAGES/cinder.po
index 3014b06e9..54700b3f7 100644
--- a/cinder/locale/bs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/bs/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-01-19 20:22+0000\n"
 "Last-Translator: yazar  <zrncescientiae@gmail.com>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1472,22 +1415,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1498,29 +1441,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2598,27 +2541,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3588,6 +3531,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3713,14 +3662,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3814,7 +3763,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Status volumena mora biti omogućen"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6663,7 +6612,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6679,7 +6627,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6698,9 +6646,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6714,19 +6661,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6886,6 +6840,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6911,7 +6870,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6921,42 +6880,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6964,106 +6923,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7071,73 +7030,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7936,23 +7895,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8640,293 +8599,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9281,12 +9240,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9302,47 +9255,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9364,203 +9285,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ca/LC_MESSAGES/cinder.po b/cinder/locale/ca/LC_MESSAGES/cinder.po
index cd3d060af..5834e4e1c 100644
--- a/cinder/locale/ca/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ca/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index 81f0d2c5d..16b6122db 100644
--- a/cinder/locale/cinder.pot
+++ b/cinder/locale/cinder.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.127\n"
+"Project-Id-Version: cinder jenkins.cinder.propose.translation.update.130\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1472,22 +1415,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1498,29 +1441,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2594,26 +2537,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3583,6 +3526,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3708,14 +3657,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3807,7 +3756,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6655,7 +6604,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6671,7 +6619,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6690,9 +6638,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6706,19 +6653,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6878,6 +6832,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6903,7 +6862,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6913,42 +6872,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6956,106 +6915,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7063,73 +7022,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7928,23 +7887,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8632,293 +8591,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
diff --git a/cinder/locale/cs/LC_MESSAGES/cinder.po b/cinder/locale/cs/LC_MESSAGES/cinder.po
index 6996a80e3..c7f7cbe31 100644
--- a/cinder/locale/cs/LC_MESSAGES/cinder.po
+++ b/cinder/locale/cs/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-04-04 20:28+0000\n"
 "Last-Translator: Zbyněk Schwarz <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -71,148 +71,134 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Svazek %(volume_id)s není k ničemu připojen"
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr "Nelze načíst data do formátu json"
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "Požadavek je neplatný."
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 #, fuzzy
 msgid "The results are invalid."
 msgstr "Požadavek je neplatný."
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Neplatný typ obsahu %(content_type)s."
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr "Služba je v tuto chvíli nedostupná."
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Obraz %(image_id)s je nepřijatelný: %(reason)s"
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr "Zdroj nemohl být nalezen."
 
-#: cinder/exception.py:216
-#, fuzzy, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr "Svazek %(volume_id)s nemohl být nastaven."
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "Nelze nalézt účet %(account_name) on zařízení Solidfire"
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Svazek %(volume_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, fuzzy, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Typ svazku %(volume_type_id)s nemohl být nalezen."
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Typ svazku s názvem %(volume_type_name)s nemohl být nalezen."
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -221,480 +207,437 @@ msgstr ""
 "Typ svazku %(volume_type_id)s nemá žádné dodatečné parametry s klíčem "
 "%(extra_specs_key)s."
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "mazání svazku %(volume_name)s který má snímek"
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr "Źádný disk ve %(location)s"
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Neplatný href %(image_href)s obrazu."
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Filtr hostitelů plácinderče %(filter_name)s nemohl být nalezen."
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, fuzzy, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr "Filtr hostitelů plácinderče %(filter_name)s nemohl být nalezen."
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Nelze najít binární soubor %(binary)s v hostiteli %(host)s."
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr "Kvóta nemohla být nalezena."
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Uživatel %(user_id)s nemohl být nalezen."
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Kvóta překročena"
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Přesun %(migration_id)s nemohl být nalezen."
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Soubor %(file_path)s nemohl být nalezen."
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr "Činnost není povolena."
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr "Dvojice klíčů %(key_name)s již existuje."
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "Typ svazku %(name)s již existuje."
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Nelze načíst aplikaci vložení '%(name)s' z %(path)s"
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Hostitel %(host)s není dostupný nebo neexistuje."
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, fuzzy, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "Zjištěn více než jeden svazek s názvem %(vol_name)"
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 "Nelze vytvořit typ_svazku s názvem %(name)s a specifikacemi "
 "%(extra_specs)s"
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr "Špatná odpověď od SolidFire API"
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "Chyba v odpovědi SolidFire API: data=%(data)s"
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, fuzzy, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, fuzzy, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr "Neplatný stav serveru: %(status)s"
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Vyskytla se neočekávaná výjimka."
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "Vyskytla se neočekávaná výjimka."
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, fuzzy, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr "Skupina LDAP %(group_id)s nemohla být nalezena."
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, fuzzy, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1490,22 +1433,22 @@ msgstr "Server neexistuje"
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Vytvořit svazek o %s GB"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, fuzzy, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
@@ -1516,29 +1459,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
@@ -2616,27 +2559,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Obraz musí být dostupný"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3612,6 +3555,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3738,14 +3687,14 @@ msgstr "Nelze získat metadata pro ip: %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3838,7 +3787,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6701,7 +6650,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6717,7 +6665,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6736,9 +6684,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6752,19 +6699,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6924,6 +6878,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6949,7 +6908,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6959,42 +6918,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -7002,106 +6961,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7109,73 +7068,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7975,23 +7934,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "skupina %s již existuje"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8679,293 +8638,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9320,12 +9279,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9341,47 +9294,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9403,27 +9324,6 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
-#~ msgstr ""
-
 #~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
@@ -9433,29 +9333,12 @@ msgstr ""
 #~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
-#~ msgstr ""
-
 #~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
-#~ msgstr ""
-
 #~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
-#~ msgstr ""
-
 #~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
@@ -9465,141 +9348,130 @@ msgstr ""
 #~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
-#~ msgstr ""
+#~ msgid "The request is invalid."
+#~ msgstr "Požadavek je neplatný."
+
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
+#~ msgstr "Svazek %(volume_id)s nemohl být nastaven."
+
+#~ msgid "No disk at %(location)s"
+#~ msgstr "Źádný disk ve %(location)s"
 
 #~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
+#~ msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
+
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
+#~ msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
+
+#~ msgid "Action not allowed."
+#~ msgstr "Činnost není povolena."
+
+#~ msgid "Key pair %(key_name)s already exists."
+#~ msgstr "Dvojice klíčů %(key_name)s již existuje."
+
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/da/LC_MESSAGES/cinder.po b/cinder/locale/da/LC_MESSAGES/cinder.po
index d56496ec4..fcac81df7 100644
--- a/cinder/locale/da/LC_MESSAGES/cinder.po
+++ b/cinder/locale/da/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-01-15 21:46+0000\n"
 "Last-Translator: Soren Hansen <soren@linux2go.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1472,22 +1415,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1498,29 +1441,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2594,26 +2537,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3583,6 +3526,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3708,14 +3657,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3807,7 +3756,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6655,7 +6604,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6671,7 +6619,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6690,9 +6638,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6706,19 +6653,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6878,6 +6832,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6903,7 +6862,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6913,42 +6872,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6956,106 +6915,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7063,73 +7022,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7928,23 +7887,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8632,293 +8591,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9273,12 +9232,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9294,47 +9247,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9356,203 +9277,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/de/LC_MESSAGES/cinder.po b/cinder/locale/de/LC_MESSAGES/cinder.po
index 98d106004..5903c906f 100644
--- a/cinder/locale/de/LC_MESSAGES/cinder.po
+++ b/cinder/locale/de/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-08-23 11:23+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,27 +2538,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Volume %s: wird erstellt"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3585,6 +3528,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3710,14 +3659,14 @@ msgstr "Nicht möglich volume %s zufinden"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3809,7 +3758,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6662,7 +6611,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6678,7 +6626,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6697,9 +6645,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6713,19 +6660,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6885,6 +6839,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6910,7 +6869,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6920,42 +6879,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6963,106 +6922,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7070,73 +7029,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7935,23 +7894,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8639,293 +8598,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9280,12 +9239,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9301,47 +9254,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9363,203 +9284,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/en_AU/LC_MESSAGES/cinder.po b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
index 684016e9a..e91c18d23 100644
--- a/cinder/locale/en_AU/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_AU/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-10-21 11:27+0000\n"
 "Last-Translator: Tom Fifield <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "Volume Type %(id)s already exists."
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Could not find parameter %(param)s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "Unable to create server object for initiator %(name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Failed to copy image to volume: %(reason)s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Invalid backup: %(reason)s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1475,22 +1418,22 @@ msgstr "volume does not exist"
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1501,29 +1444,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2601,27 +2544,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Volume must be available"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3594,6 +3537,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3719,14 +3668,14 @@ msgstr "Failed to create transfer record for %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3820,7 +3769,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume Snapshot status must be available or error"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6680,7 +6629,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6696,7 +6644,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6715,9 +6663,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6731,19 +6678,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6903,6 +6857,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6928,7 +6887,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6938,42 +6897,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6981,106 +6940,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7088,73 +7047,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7953,23 +7912,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "Volume (%s) already exists on array"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8657,293 +8616,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9298,12 +9257,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9319,47 +9272,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9381,203 +9302,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/en_GB/LC_MESSAGES/cinder.po b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
index 2bed547bb..a664655e2 100644
--- a/cinder/locale/en_GB/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_GB/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-03-30 11:10+0000\n"
 "Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -70,626 +70,569 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Volume %(volume_id)s is still attached, detach volume first."
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr "Failed to load data into json format"
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "The request is invalid."
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 #, fuzzy
 msgid "The results are invalid."
 msgstr "The request is invalid."
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Could not find parameter %(param)s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "Unable to create server object for initiator %(name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Unknown NFS exception"
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "Unknown Gluster exception"
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Failed to copy image to volume: %(reason)s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Invalid backup: %(reason)s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1478,22 +1421,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1504,29 +1447,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2604,27 +2547,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Volume must be available"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3597,6 +3540,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3723,14 +3672,14 @@ msgstr "Failed to create transfer record for %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3824,7 +3773,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume Snapshot status must be available or error"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6681,7 +6630,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6697,7 +6645,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6716,9 +6664,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6732,19 +6679,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6904,6 +6858,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6929,7 +6888,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6939,42 +6898,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6982,106 +6941,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7089,73 +7048,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7954,23 +7913,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8658,293 +8617,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9299,12 +9258,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9320,47 +9273,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9382,203 +9303,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
-#~ msgstr ""
+#~ msgid "The request is invalid."
+#~ msgstr "The request is invalid."
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/en_US/LC_MESSAGES/cinder.po b/cinder/locale/en_US/LC_MESSAGES/cinder.po
index 0fb3e1c27..3d0324e2d 100644
--- a/cinder/locale/en_US/LC_MESSAGES/cinder.po
+++ b/cinder/locale/en_US/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: markmc <markmc@redhat.com>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -70,147 +70,133 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Volume %(volume_id)s is still attached, detach volume first."
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr "Failed to load data into json format"
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "The request is invalid."
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr "The results are invalid."
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr "Service is unavailable at this time."
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Image %(image_id)s is unacceptable: %(reason)s"
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, fuzzy, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr "Expected a uuid but received %(uuid)s."
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr "Resource could not be found."
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr "Volume %(volume_id)s persistence file could not be found."
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "Unable to locate account %(account_name)s on Solidfire device"
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Volume not found for instance %(instance_id)s."
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Volume type %(volume_type_id)s could not be found."
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Volume type with name %(volume_type_name)s could not be found."
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -219,79 +205,74 @@ msgstr ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snapshot %(snapshot_id)s could not be found."
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "deleting volume %(volume_name)s that has snapshot"
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr "deleting snapshot %(snapshot_name)s that has dependent volumes"
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "No target id found for volume %(volume_id)s."
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr "No disk at %(location)s"
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Invalid image href %(image_href)s."
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Image %(image_id)s could not be found."
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Service %(service_id)s could not be found."
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s could not be found."
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Scheduler Host Filter %(filter_name)s could not be found."
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr "Scheduler Host Weigher %(weigher_name)s could not be found."
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Could not find binary %(binary)s on host %(host)s."
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -300,242 +281,209 @@ msgstr ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr "Quota could not be found"
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unknown quota resources %(unknown)s."
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Quota for project %(project_id)s could not be found."
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Quota class %(class_name)s could not be found."
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Quota usage for project %(project_id)s could not be found."
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Quota reservation %(uuid)s could not be found."
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Quota exceeded for resources: %(overs)s"
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Migration %(migration_id)s could not be found."
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr "Migration not found for instance %(instance_id)s with status %(status)s."
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "File %(file_path)s could not be found."
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr "Class %(class_name)s could not be found: %(exception)s"
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr "Action not allowed."
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr "Key pair %(key_name)s already exists."
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "Volume Type %(id)s already exists."
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Malformed message body: %(reason)s"
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Could not find config at %(path)s"
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Could not find config at %(param)s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Could not load paste app '%(name)s' from %(path)s"
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "No valid host was found. %(reason)s"
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Host %(host)s is not up or doesn't exist."
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr "Requested volume or snapshot exceeds allowed Gigabytes quota"
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr "Maximum volume/snapshot size exceeded"
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr "Maximum number of volumes allowed (%(allowed)d) exceeded"
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "Detected more than one volume with name %(vol_name)s"
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr "3PAR Host already exists: %(err)s.  %(info)s"
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr "Invalid 3PAR Domain: %(err)s"
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr "Bad response from SolidFire API"
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "Error in SolidFire API response: data=%(data)s"
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr "Unknown or unsupported command %(cmd)s"
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr "Malformed response to command %(cmd)s: %(reason)s"
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr "Bad HTTP response status %(status)s"
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr "Operation failed with status=%(status)s. Full dump: %(data)s"
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "Unable to create server object for initiator %(name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr "Unable to find server object for initiator %(name)s"
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr "Unable to find any active VPSA controller"
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr "Failed to retrieve attachments for volume %(name)s"
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr "Invalid attachment info for volume %(name)s: %(reason)s"
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr "Bad or unexpected response from the storage volume backend API: %(data)s"
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr "Unknown NFS exception"
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr "No mounted NFS shares found"
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr "There is no share which can host %(volume_size)sG"
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr "Unknown Gluster exception"
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr "No mounted Gluster shares found"
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
@@ -544,155 +492,150 @@ msgstr ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Failed to copy image to volume: %(reason)s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr "Backup %(backup_id)s could not be found."
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Invalid backup: %(reason)s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, fuzzy, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr "Transfer %(transfer_id)s could not be found."
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1487,22 +1430,22 @@ msgstr "volume does not exist"
 msgid "vol=%s"
 msgstr "vol=%s"
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "Delete volume with id: %s"
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr "Invalid imageRef provided."
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "Removing options '%(bad_options)s' from query"
@@ -1513,29 +1456,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr "Removing options '%s' from query"
@@ -2654,27 +2597,27 @@ msgstr "Unrecognized read_deleted value '%s'"
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Volume must be available"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3671,6 +3614,12 @@ msgstr "Faked command raised an exception %s"
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3808,7 +3757,7 @@ msgstr "Failed to create transfer record for %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
@@ -3817,7 +3766,7 @@ msgstr ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3915,7 +3864,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume Snapshot status must be available or error"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr "Metadata property key blank"
 
@@ -6959,7 +6908,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6975,7 +6923,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6994,9 +6942,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -7010,19 +6957,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -7182,6 +7136,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -7207,7 +7166,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -7217,42 +7176,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
-msgstr "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
+msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -7260,106 +7219,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
-msgstr "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
+msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7367,73 +7326,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -8248,23 +8207,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "Volume (%s) already exists on array"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8952,293 +8911,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr "Retry info not present, will not reschedule"
 
@@ -9593,15 +9552,6 @@ msgstr "Retry info not present, will not reschedule"
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr "_get_device_type: Storage Pool must be configured."
 
@@ -9617,61 +9567,15 @@ msgstr "Retry info not present, will not reschedule"
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr "create_export:Volume %(name)s does not exist."
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-#~ "initialize_connection:Failed to find target "
-#~ "ipfor initiator:%(initiatorname)s,please check "
-#~ "config file."
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-#~ "initialize_connection:host name: %(host)s,initiator "
-#~ "name: %(ini)s, hostport name: %(port)s"
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr "terminate_connection:Host does not exist. Host name:%(host)s."
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr "terminate_connection:volume does not exist. volume name:%(volume)s"
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s,volume "
-#~ "name:%(volumename)s."
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr "create_snapshot:Device does not support snapshot."
 
@@ -9693,36 +9597,6 @@ msgstr "Retry info not present, will not reschedule"
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
-#~ msgstr ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
-#~ msgstr ""
-#~ "create_volume_from_snapshot:Snapshot does not "
-#~ "exist.Snapshot name:%(name)s"
-
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
-#~ msgstr ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
-
 #~ msgid "_check_conf_file: %s"
 #~ msgstr "_check_conf_file: %s"
 
@@ -9732,36 +9606,12 @@ msgstr "Retry info not present, will not reschedule"
 #~ msgid "_get_login_info error. %s"
 #~ msgstr "_get_login_info error. %s"
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
-#~ msgstr ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\" or \"Thick\". LUNType:%(type)s"
-
 #~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
-#~ msgstr ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
-
 #~ msgid "_get_lun_set_info:%s"
 #~ msgstr "_get_lun_set_info:%s"
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
-#~ msgstr ""
-#~ "_get_maximum_pool:maxpoolid is None.Please check "
-#~ "config file and make sure the "
-#~ "\"Name\" in \"StoragePool\" is right."
-
 #~ msgid "_get_iscsi_info:%s"
 #~ msgstr "_get_iscsi_info:%s"
 
@@ -9771,184 +9621,132 @@ msgstr "Retry info not present, will not reschedule"
 #~ msgid "_execute_cli:%s"
 #~ msgstr "_execute_cli:%s"
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgstr "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgstr "_get_tgt_iqn:iSCSI IP is %s."
+
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgstr "_get_tgt_iqn:iSCSI target iqn is:%s"
+
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgstr "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgstr "_delete_host: Failed delete host. host id:%(hostid)s.out:%(out)s"
+
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgstr "_is_resource_pool_enough:Resource pool for snapshot not be added."
+
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup.host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
-#~ "_add_initiator:Failed to add initiator.initiator "
-#~ "name:%(name)s out:%(out)s"
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
-#~ "_delete_initiator:ERROE:Failed to delete "
-#~ "initiator.initiator name:%(name)s out:%(out)s"
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)sport information:%(info)s host "
-#~ "id:%(host)sout:%(out)s"
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
-#~ msgstr "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
+#~ msgstr "The request is invalid."
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
-#~ msgstr "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
+#~ msgstr "Volume %(volume_id)s persistence file could not be found."
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
-#~ msgstr "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
+#~ msgstr "No disk at %(location)s"
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
-#~ msgstr ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
+#~ msgstr "Class %(class_name)s could not be found: %(exception)s"
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
-#~ msgstr "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
+#~ msgstr "Action not allowed."
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
-#~ msgstr "_delete_host: Failed delete host. host id:%(hostid)s.out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
+#~ msgstr "Key pair %(key_name)s already exists."
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
-#~ msgstr ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
+#~ msgstr "Maximum volume/snapshot size exceeded"
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
-#~ msgstr ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
+#~ msgstr "3PAR Host already exists: %(err)s.  %(info)s"
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
-#~ "_wait_for_luncopy:LUNcopy status isnot normal. "
-#~ "LUNcopy name:%(luncopyname)s"
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
-#~ msgstr ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
+#~ msgstr "do_setup."
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owningcontroller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
-#~ msgstr "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
+#~ msgstr "delete_volume: volume name: %s."
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/es/LC_MESSAGES/cinder.po b/cinder/locale/es/LC_MESSAGES/cinder.po
index dbf95f102..13068967a 100644
--- a/cinder/locale/es/LC_MESSAGES/cinder.po
+++ b/cinder/locale/es/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-03-10 06:08+0000\n"
 "Last-Translator: Oscar Rosario <oscar.inirio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -70,628 +70,571 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr "Fallo al ingresar informacion en formato json"
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "La petición es inválida."
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 #, fuzzy
 msgid "The results are invalid."
 msgstr "La petición es inválida."
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr "El servicio no esta disponible en este momento"
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Imposible encontrar SR en VBD %s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 "No es posible crear el VDI en SR %(sr_ref)s para la instancia "
 "%(instance_name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Imposible encontrar volumen %s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "backend inválido: %s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1481,22 +1424,22 @@ msgstr "el grupo de volumenes %s no existe"
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Crear volumen de %s GB"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1507,29 +1450,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2607,27 +2550,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3602,6 +3545,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3728,14 +3677,14 @@ msgstr "Fallo al generar metadatos para la ip %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3829,7 +3778,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "El estado del volumen debe estar disponible"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6689,7 +6638,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6705,7 +6653,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6724,9 +6672,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6740,19 +6687,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6912,6 +6866,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6937,7 +6896,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6947,42 +6906,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6990,106 +6949,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7097,73 +7056,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7962,23 +7921,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "el grupo %s ya existe"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8666,293 +8625,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9307,12 +9266,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9328,47 +9281,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9390,203 +9311,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
-#~ msgstr ""
+#~ msgid "The request is invalid."
+#~ msgstr "La petición es inválida."
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/es_MX/LC_MESSAGES/cinder.po b/cinder/locale/es_MX/LC_MESSAGES/cinder.po
index c1b7d8f0a..1bd71705e 100644
--- a/cinder/locale/es_MX/LC_MESSAGES/cinder.po
+++ b/cinder/locale/es_MX/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-08-30 09:12+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (Mexico) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -8999,9 +8958,6 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
 #~ msgstr ""
 
 #~ msgid "_get_device_type: Storage Pool must be configured."
@@ -9019,47 +8975,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9081,188 +9005,139 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid ""
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid ""
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "_update_volume_stats: Updating volume stats"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
index 661e3eee5..c0939d66c 100644
--- a/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
+++ b/cinder/locale/fi_FI/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/fr/LC_MESSAGES/cinder.po b/cinder/locale/fr/LC_MESSAGES/cinder.po
index bc543bea9..b3313dd5b 100644
--- a/cinder/locale/fr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/fr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-04-06 14:54+0000\n"
 "Last-Translator: EmmanuelLeNormand <manu@ubuntu-fr.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -70,628 +70,571 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Le volume %(volume_id)s n'est lié à rien"
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr "Échec du chargement des données au format JSON"
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "La requête est invalide."
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 #, fuzzy
 msgid "The results are invalid."
 msgstr "La requête est invalide."
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Le type de contenu %(content_type)s est invalide"
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr "Le service est indisponible actuellement."
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "le groupe %s existe déjà"
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 "Impossible de créer VDI sur SR %(sr_ref)s pour l'instance "
 "%(instance_name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Une exception inconnue s'est produite."
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "Une exception inconnue s'est produite."
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Impossible de trouver le volume %s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Backend invalide : %s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1481,22 +1424,22 @@ msgstr "Le groupe de volume %s n'existe pas"
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Création d'un volume de %s Go"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1507,29 +1450,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2607,27 +2550,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3602,6 +3545,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3728,14 +3677,14 @@ msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3829,7 +3778,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Le status du volume doit être disponible"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6695,7 +6644,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6711,7 +6659,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6730,9 +6678,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6746,19 +6693,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6918,6 +6872,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6943,7 +6902,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6953,42 +6912,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6996,106 +6955,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7103,73 +7062,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7968,23 +7927,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "le groupe %s existe déjà"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8672,293 +8631,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9313,12 +9272,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9334,47 +9287,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9396,203 +9317,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
-#~ msgstr ""
+#~ msgid "The request is invalid."
+#~ msgstr "La requête est invalide."
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/hi/LC_MESSAGES/cinder.po b/cinder/locale/hi/LC_MESSAGES/cinder.po
index bfc091237..85425d0fc 100644
--- a/cinder/locale/hi/LC_MESSAGES/cinder.po
+++ b/cinder/locale/hi/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-08-27 04:58+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Hindi "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9017,9 +8976,6 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
 #~ msgstr ""
 
 #~ msgid "_get_device_type: Storage Pool must be configured."
@@ -9037,47 +8993,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9099,203 +9023,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/hr/LC_MESSAGES/cinder.po b/cinder/locale/hr/LC_MESSAGES/cinder.po
index a03570a6a..06390fe84 100644
--- a/cinder/locale/hr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/hr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -72,623 +72,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1474,22 +1417,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1500,29 +1443,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2596,26 +2539,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3585,6 +3528,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3710,14 +3659,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3809,7 +3758,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6657,7 +6606,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6673,7 +6621,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6692,9 +6640,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6708,19 +6655,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6880,6 +6834,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6905,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6915,42 +6874,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6958,106 +6917,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7065,73 +7024,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7930,23 +7889,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8634,293 +8593,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9275,12 +9234,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9296,47 +9249,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9358,203 +9279,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/hu/LC_MESSAGES/cinder.po b/cinder/locale/hu/LC_MESSAGES/cinder.po
index 7f84386de..08e1bdae1 100644
--- a/cinder/locale/hu/LC_MESSAGES/cinder.po
+++ b/cinder/locale/hu/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/id/LC_MESSAGES/cinder.po b/cinder/locale/id/LC_MESSAGES/cinder.po
index 9c99cfe76..6bf1d0e1e 100644
--- a/cinder/locale/id/LC_MESSAGES/cinder.po
+++ b/cinder/locale/id/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/it/LC_MESSAGES/cinder.po b/cinder/locale/it/LC_MESSAGES/cinder.po
index 17d37ccdc..feb97ab13 100644
--- a/cinder/locale/it/LC_MESSAGES/cinder.po
+++ b/cinder/locale/it/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-04-01 18:59+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -70,626 +70,569 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "La richiesta non è valida."
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 #, fuzzy
 msgid "The results are invalid."
 msgstr "La richiesta non è valida."
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "Impossible creare il VDI su SR %(sr_ref)s per l'istanza %(instance_name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1478,22 +1421,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1504,29 +1447,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2604,27 +2547,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3596,6 +3539,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3722,14 +3671,14 @@ msgstr "Impossibile localizzare il volume %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3823,7 +3772,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6681,7 +6630,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6697,7 +6645,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6716,9 +6664,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6732,19 +6679,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6904,6 +6858,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6929,7 +6888,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6939,42 +6898,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6982,106 +6941,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7089,73 +7048,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7954,23 +7913,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8658,293 +8617,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9299,12 +9258,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9320,47 +9273,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9382,203 +9303,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
-#~ msgstr ""
+#~ msgid "The request is invalid."
+#~ msgstr "La richiesta non è valida."
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/it_IT/LC_MESSAGES/cinder.po b/cinder/locale/it_IT/LC_MESSAGES/cinder.po
index fae7609c5..ac003fe00 100644
--- a/cinder/locale/it_IT/LC_MESSAGES/cinder.po
+++ b/cinder/locale/it_IT/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (Italy) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ja/LC_MESSAGES/cinder.po b/cinder/locale/ja/LC_MESSAGES/cinder.po
index ea1ae4dc6..5a21d9882 100644
--- a/cinder/locale/ja/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ja/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-08-23 11:22+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: \n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "ボリューム %s 用の iSCSI エクスポートが見つかりません"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "インスタンス %(instance_name)s 用のSR %(sr_ref)s における VDI を作成できません"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "不正なバックエンドです: %s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1476,22 +1419,22 @@ msgstr "ボリュームグループ%sが存在しません。"
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume: %s GBのボリュームを作成します。"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1502,29 +1445,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2602,27 +2545,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3595,6 +3538,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3720,14 +3669,14 @@ msgstr "ip %s に対するメタデータの取得に失敗しました。"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3821,7 +3770,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6681,7 +6630,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6697,7 +6645,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6716,9 +6664,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6732,19 +6679,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6904,6 +6858,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6929,7 +6888,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6939,42 +6898,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6982,106 +6941,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7089,73 +7048,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7954,23 +7913,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "グループ %s は既に存在しています。"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8658,293 +8617,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9299,12 +9258,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9320,47 +9273,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9382,203 +9303,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
index a6ea9a355..77a620ce6 100644
--- a/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ka_GE/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Georgian (Georgia) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ko/LC_MESSAGES/cinder.po b/cinder/locale/ko/LC_MESSAGES/cinder.po
index 801e75901..6b061a789 100644
--- a/cinder/locale/ko/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ko/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-12-16 04:42+0000\n"
 "Last-Translator: Zhongyue Luo <lzyeval@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "%(instance_name)s 인스턴스의 %(sr_ref)s SR에 대한 VDI 생성이 실패했습니다"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2599,27 +2542,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3589,6 +3532,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3714,14 +3663,14 @@ msgstr "%s 볼륨을 찾을수 없습니다"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3815,7 +3764,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6670,7 +6619,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6686,7 +6634,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6705,9 +6653,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6721,19 +6668,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6893,6 +6847,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6918,7 +6877,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6928,42 +6887,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6971,106 +6930,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7078,73 +7037,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7943,23 +7902,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8647,293 +8606,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9288,12 +9247,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9309,47 +9262,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9371,203 +9292,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
index 4be56d168..8fc608b1d 100644
--- a/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ko_KR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean (Korea) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ms/LC_MESSAGES/cinder.po b/cinder/locale/ms/LC_MESSAGES/cinder.po
index c7adfe1bb..1b010533f 100644
--- a/cinder/locale/ms/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ms/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/nb/LC_MESSAGES/cinder.po b/cinder/locale/nb/LC_MESSAGES/cinder.po
index da71ada14..0f313bf47 100644
--- a/cinder/locale/nb/LC_MESSAGES/cinder.po
+++ b/cinder/locale/nb/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Norwegian Bokmål "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ne/LC_MESSAGES/cinder.po b/cinder/locale/ne/LC_MESSAGES/cinder.po
index 9285c165f..7832c2d06 100644
--- a/cinder/locale/ne/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ne/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-08-30 22:38+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Nepali "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -8999,9 +8958,6 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
 #~ msgstr ""
 
 #~ msgid "_get_device_type: Storage Pool must be configured."
@@ -9019,47 +8975,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9081,188 +9005,139 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid ""
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid ""
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "_update_volume_stats: Updating volume stats"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
index c42811e4a..18bc3843b 100644
--- a/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
+++ b/cinder/locale/nl_NL/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/pl_PL/LC_MESSAGES/cinder.po b/cinder/locale/pl_PL/LC_MESSAGES/cinder.po
index 0a658896f..ad40d293a 100644
--- a/cinder/locale/pl_PL/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pl_PL/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-07-01 16:14+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Polish (Poland) "
@@ -72,623 +72,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1474,22 +1417,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1500,29 +1443,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2596,26 +2539,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3585,6 +3528,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3710,14 +3659,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3809,7 +3758,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6657,7 +6606,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6673,7 +6621,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6692,9 +6640,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6708,19 +6655,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6880,6 +6834,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6905,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6915,42 +6874,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6958,106 +6917,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7065,73 +7024,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7930,23 +7889,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8634,293 +8593,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9275,12 +9234,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9296,47 +9249,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9358,203 +9279,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/pt/LC_MESSAGES/cinder.po b/cinder/locale/pt/LC_MESSAGES/cinder.po
index d9c5019e6..f84e1ffa4 100644
--- a/cinder/locale/pt/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pt/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
index c6374ee79..38aa9e9f2 100644
--- a/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/pt_BR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-02-06 21:07+0000\n"
 "Last-Translator: Adriano Steffler <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -70,625 +70,568 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "group %s já existe"
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Não é possível localizar o volume %s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 "Não é possível criar o VDI no SR %(sr_ref)s para a instância "
 "%(instance_name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Não é possível localizar o volume %s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Backend inválido: %s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1477,22 +1420,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Criar volume de %s GB"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1503,29 +1446,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2603,27 +2546,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3595,6 +3538,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3720,14 +3669,14 @@ msgstr "Falha ao obter metadados para o ip: %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3821,7 +3770,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "O status do volume parece estar disponível"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6680,7 +6629,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6696,7 +6644,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6715,9 +6663,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6731,19 +6678,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6903,6 +6857,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6928,7 +6887,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6938,42 +6897,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6981,106 +6940,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7088,73 +7047,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7953,23 +7912,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "group %s já existe"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8657,293 +8616,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9298,12 +9257,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9319,47 +9272,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9381,203 +9302,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ro/LC_MESSAGES/cinder.po b/cinder/locale/ro/LC_MESSAGES/cinder.po
index 9aedfc777..9be2267ab 100644
--- a/cinder/locale/ro/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ro/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-06-12 07:55+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -72,623 +72,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1474,22 +1417,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1500,29 +1443,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2596,26 +2539,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3585,6 +3528,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3710,14 +3659,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3809,7 +3758,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6657,7 +6606,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6673,7 +6621,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6692,9 +6640,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6708,19 +6655,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6880,6 +6834,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6905,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6915,42 +6874,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6958,106 +6917,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7065,73 +7024,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7930,23 +7889,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8634,293 +8593,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9275,12 +9234,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9296,47 +9249,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9358,203 +9279,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ru/LC_MESSAGES/cinder.po b/cinder/locale/ru/LC_MESSAGES/cinder.po
index a114a8254..644fd9f37 100644
--- a/cinder/locale/ru/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ru/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-03-25 09:34+0000\n"
 "Last-Translator: Eugene Marshal <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -71,148 +71,134 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Том %(volume_id)s никуда не присоединён"
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr "Ошибка загрузки данных в формат json"
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "Недопустимый запрос."
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 #, fuzzy
 msgid "The results are invalid."
 msgstr "Недопустимый запрос."
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Недопустимый тип содержимого %(content_type)s."
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr "В данный момент служба недоступна."
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Образ %(image_id)s недопустим: %(reason)s"
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr "Ресурс не может быть найден."
 
-#: cinder/exception.py:216
-#, fuzzy, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr "Том %(volume_id)s не найден."
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Том %(volume_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, fuzzy, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Тип тома %(volume_type_id)s не может быть найден."
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Тип тома под названием %(volume_type_name)s не может быть найден."
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -221,480 +207,437 @@ msgstr ""
 "Тип тома %(volume_type_id)s не имеет дополнительных особенностей с ключом"
 " %(extra_specs_key)s."
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "удаление тома %(volume_name)s, который имеет снимок"
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr "Отсутствует диск в %(location)s"
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Недопустимый образ href %(image_href)s."
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Служба %(service_id)s не найдена."
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Узел %(host)s не найден."
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, fuzzy, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr "Узел сompute %(host)s не найден."
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr "Квота не найдена"
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Пользователь %(user_id)s не найден."
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Превышена квота"
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Перемещение %(migration_id)s не найдено."
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr "Перемещение не найдено для копии %(instance_id)s в состоянии %(status)s."
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Файл %(file_path)s не может быть найден."
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr "Класс %(class_name)s не найден: %(exception)s"
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr "Действие не разрешено."
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "Тип тома %(name)s уже существует."
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Неправильное тело сообщения: %(reason)s"
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Узел %(host)s не работает или не существует."
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 "Невозможно создать volume_type с именем %(name)s и спецификациями "
 "%(extra_specs)s"
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, fuzzy, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr "Неправильное тело сообщения: %(reason)s"
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, fuzzy, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr "Недопустимое состояние сервера: %(status)s"
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "Невозможно создать VDI на SR %(sr_ref)s для копии %(instance_name)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, fuzzy, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr "Невозможно найти узел для копии %s"
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Обнаружено неизвестное исключение."
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "Обнаружено неизвестное исключение."
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "Невозможно найти том %s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, fuzzy, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr "Группа LDAP %(group_id)s не найдена."
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "Недопустимый внутренний интерфейс: %s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, fuzzy, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1492,22 +1435,22 @@ msgstr "Сервер не существует"
 msgid "vol=%s"
 msgstr "vol=%s"
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, fuzzy, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
@@ -1518,29 +1461,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
@@ -2618,27 +2561,27 @@ msgstr "Нераспознанное значение read_deleted '%s'"
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3623,6 +3566,12 @@ msgstr "Имитация команды привела к исключению %
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Ответ на имитацию команды в stdout='%(stdout)s' stderr='%(stderr)s'"
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3753,14 +3702,14 @@ msgstr "Ошибка получения метаданных для ip: %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr "Превышена квота для %(pid)s, попытка создания тома %(size)sG"
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3854,7 +3803,7 @@ msgstr "Превышена квота для %(pid)s, попытка выпол
 msgid "Volume Snapshot status must be available or error"
 msgstr "Состояние тома должно быть доступно"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6723,7 +6672,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6739,7 +6687,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6758,9 +6706,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6774,19 +6721,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6946,6 +6900,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6971,7 +6930,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6981,42 +6940,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -7024,106 +6983,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
-#, fuzzy, python-format
-msgid "delete_volume: volume name: %s."
-msgstr "Удалить том с идентификатором: %s"
+#: cinder/volume/drivers/huawei/ssh_common.py:498
+#, python-format
+msgid "delete_volume: volume name: %s"
+msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7131,73 +7090,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -8000,23 +7959,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "группа %s уже существует"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8704,293 +8663,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9345,12 +9304,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9366,47 +9319,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9428,27 +9349,6 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
-#~ msgstr ""
-
 #~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
@@ -9458,29 +9358,12 @@ msgstr ""
 #~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
-#~ msgstr ""
-
 #~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
-#~ msgstr ""
-
 #~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
-#~ msgstr ""
-
 #~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
@@ -9490,141 +9373,132 @@ msgstr ""
 #~ msgid "_execute_cli:%s"
 #~ msgstr "_удалить: %s"
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
-#~ msgstr ""
+#~ msgid "The request is invalid."
+#~ msgstr "Недопустимый запрос."
+
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
+#~ msgstr "Том %(volume_id)s не найден."
+
+#~ msgid "No disk at %(location)s"
+#~ msgstr "Отсутствует диск в %(location)s"
 
 #~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
+#~ "Перемещение не найдено для копии "
+#~ "%(instance_id)s в состоянии %(status)s."
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
+#~ msgstr "Класс %(class_name)s не найден: %(exception)s"
+
+#~ msgid "Action not allowed."
+#~ msgstr "Действие не разрешено."
+
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "delete_volume: volume name: %s."
+#~ msgstr "Удалить том с идентификатором: %s"
+
+#~ msgid ""
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+#~ msgstr ""
+
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
index c1d74c429..aa6be4269 100644
--- a/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
+++ b/cinder/locale/ru_RU/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian (Russia) "
@@ -72,623 +72,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1474,22 +1417,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1500,29 +1443,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2596,26 +2539,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3585,6 +3528,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3710,14 +3659,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3809,7 +3758,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6657,7 +6606,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6673,7 +6621,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6692,9 +6640,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6708,19 +6655,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6880,6 +6834,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6905,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6915,42 +6874,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6958,106 +6917,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7065,73 +7024,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7930,23 +7889,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8634,293 +8593,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9275,12 +9234,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9296,47 +9249,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9358,203 +9279,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/sk/LC_MESSAGES/cinder.po b/cinder/locale/sk/LC_MESSAGES/cinder.po
index 53be02dd2..e244e83b3 100644
--- a/cinder/locale/sk/LC_MESSAGES/cinder.po
+++ b/cinder/locale/sk/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-08-27 04:58+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Slovak "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9017,9 +8976,6 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
 #~ msgstr ""
 
 #~ msgid "_get_device_type: Storage Pool must be configured."
@@ -9037,47 +8993,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9099,203 +9023,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/sl_SI/LC_MESSAGES/cinder.po b/cinder/locale/sl_SI/LC_MESSAGES/cinder.po
index 85c2766f1..6f9290c98 100644
--- a/cinder/locale/sl_SI/LC_MESSAGES/cinder.po
+++ b/cinder/locale/sl_SI/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-07-01 16:14+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Slovenian (Slovenia) "
@@ -72,623 +72,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1474,22 +1417,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1500,29 +1443,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2596,26 +2539,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3585,6 +3528,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3710,14 +3659,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3809,7 +3758,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6657,7 +6606,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6673,7 +6621,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6692,9 +6640,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6708,19 +6655,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6880,6 +6834,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6905,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6915,42 +6874,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6958,106 +6917,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7065,73 +7024,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7930,23 +7889,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8634,293 +8593,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9275,12 +9234,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9296,47 +9249,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9358,203 +9279,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
index 8fa90ae22..94e3c5a84 100644
--- a/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
+++ b/cinder/locale/sw_KE/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Swahili (Kenya) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/tl/LC_MESSAGES/cinder.po b/cinder/locale/tl/LC_MESSAGES/cinder.po
index f84acd46d..a38d2818c 100644
--- a/cinder/locale/tl/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tl/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1472,22 +1415,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1498,29 +1441,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2594,26 +2537,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3583,6 +3526,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3708,14 +3657,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3807,7 +3756,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/tr/LC_MESSAGES/cinder.po b/cinder/locale/tr/LC_MESSAGES/cinder.po
index b10d2bbbc..cf741d128 100644
--- a/cinder/locale/tr/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-12-14 18:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -70,623 +70,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1472,22 +1415,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1498,29 +1441,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2594,26 +2537,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3583,6 +3526,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3708,14 +3657,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3807,7 +3756,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6655,7 +6604,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6671,7 +6619,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6690,9 +6638,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6706,19 +6653,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6878,6 +6832,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6903,7 +6862,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6913,42 +6872,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6956,106 +6915,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7063,73 +7022,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7928,23 +7887,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8632,293 +8591,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9273,12 +9232,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9294,47 +9247,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9356,203 +9277,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
index 46ac3a32f..0aa658068 100644
--- a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Turkish (Turkey) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/uk/LC_MESSAGES/cinder.po b/cinder/locale/uk/LC_MESSAGES/cinder.po
index bd2ef3071..8f3c0532c 100644
--- a/cinder/locale/uk/LC_MESSAGES/cinder.po
+++ b/cinder/locale/uk/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr "Створити розділ на %s ГБ"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6657,7 +6606,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6673,7 +6621,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6692,9 +6640,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6708,19 +6655,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6880,6 +6834,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6905,7 +6864,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6915,42 +6874,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6958,106 +6917,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7065,73 +7024,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7930,23 +7889,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8634,293 +8593,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9275,12 +9234,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9296,47 +9249,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9358,203 +9279,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
index 9e9e8e8db..2ae9cda8a 100644
--- a/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
+++ b/cinder/locale/vi_VN/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-08 11:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
index e8a1628d4..be49031df 100644
--- a/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_CN/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-04-03 23:36+0000\n"
 "Last-Translator: cheesecake <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
@@ -70,626 +70,569 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "卷 %(volume_id)s 没有附加任何东西"
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr "把数据加载为json格式失败"
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr "请求无效。"
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 #, fuzzy
 msgid "The results are invalid."
 msgstr "请求无效。"
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr "该时刻服务无法使用。"
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
-#: cinder/exception.py:216
-#, fuzzy, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr "卷 %(volume_id)s 没有找到。"
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "无法找到帐户 %(account_name) on Solidfire 设备"
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "卷 %(volume_id)s 没有含键 %(metadata_key)s 的元数据。"
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, fuzzy, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "卷类型 %(volume_type_id)s 没有找到。"
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "名为 %(volume_type_name)s 的卷类型没有找到。"
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "卷类型 %(volume_type_id)s 没有额外说明键 %(extra_specs_key)s 。"
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "正在删除有快照的卷  %(volume_name)s"
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr "在 %(location)s 没有磁盘"
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜像href %(image_href)s。"
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, fuzzy, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。"
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr "配额没有找到。"
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "用户 %(user_id)s 没有找到。"
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "超出配额"
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "迁移 %(migration_id)s 没有找到。"
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。"
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr "操作不允许。"
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr "密钥对 %(key_name)s 已经存在。"
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, fuzzy, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr "卷类型 %(name)s 已经存在。"
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "主机 %(host)s 没有启动或者不存在。"
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, fuzzy, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "检测到不止一个名称为 %(vol_name) 的卷。"
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr "无法创建名称为 %(name)s 规格为 %(extra_specs)s 的卷类型。"
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr "来自SolidFire API的错误响应"
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "SolidFire API响应里发生错误：data=%(data)s"
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, fuzzy, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, fuzzy, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr "无效的服务器状态：%(status)s"
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "无法在存储库 %(sr_ref)s 上为实例 %(instance_name)s 创建 VDI"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, fuzzy, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr "无法找到实例 %s 的宿主机"
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "发生未知异常。"
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "发生未知异常。"
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "无法找到 %s 卷"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, fuzzy, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr "没有找到LDAP用户组 %(group_id)s。"
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, fuzzy, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr "无效的后台：%s"
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, fuzzy, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1483,22 +1426,22 @@ msgstr "域不存在"
 msgid "vol=%s"
 msgstr "vol=%s"
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "删除id为 %s 的卷"
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr "提供了无效的imageRef。"
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, fuzzy, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -1509,29 +1452,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, fuzzy, python-format
 msgid "Removing options '%s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -2609,27 +2552,27 @@ msgstr "无法识别的 read_deleted 取值”%s“"
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "必须可用"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3621,6 +3564,12 @@ msgstr "伪命令引起异常 %s"
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%(stderr)s'"
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3753,14 +3702,14 @@ msgstr "为ip： %s获取元数据失败"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr "%(pid)s 的配额超出，尝试创建 %(size)sG 的卷"
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3854,7 +3803,7 @@ msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 msgid "Volume Snapshot status must be available or error"
 msgstr "卷组状态必须可获取"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6728,7 +6677,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6744,7 +6692,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6763,9 +6711,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6779,19 +6726,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6951,6 +6905,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6976,7 +6935,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6986,42 +6945,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -7029,106 +6988,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
-#, fuzzy, python-format
-msgid "delete_volume: volume name: %s."
-msgstr "删除id为 %s 的卷"
+#: cinder/volume/drivers/huawei/ssh_common.py:498
+#, python-format
+msgid "delete_volume: volume name: %s"
+msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7136,73 +7095,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -8002,23 +7961,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr "安全组 %s 已经存在"
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8706,293 +8665,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9347,12 +9306,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9368,47 +9321,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9430,27 +9351,6 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
-#~ msgstr ""
-
 #~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
@@ -9460,29 +9360,12 @@ msgstr ""
 #~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
-#~ msgstr ""
-
 #~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
-#~ msgstr ""
-
 #~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
-#~ msgstr ""
-
 #~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
@@ -9492,141 +9375,130 @@ msgstr ""
 #~ msgid "_execute_cli:%s"
 #~ msgstr "_delete: %s"
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
-#~ msgstr ""
+#~ msgid "The request is invalid."
+#~ msgstr "请求无效。"
+
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
+#~ msgstr "卷 %(volume_id)s 没有找到。"
+
+#~ msgid "No disk at %(location)s"
+#~ msgstr "在 %(location)s 没有磁盘"
 
 #~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
+#~ msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。"
+
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
+#~ msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
+
+#~ msgid "Action not allowed."
+#~ msgstr "操作不允许。"
+
+#~ msgid "Key pair %(key_name)s already exists."
+#~ msgstr "密钥对 %(key_name)s 已经存在。"
+
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
-#~ msgstr ""
+#~ msgid "delete_volume: volume name: %s."
+#~ msgstr "删除id为 %s 的卷"
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
index dd9bfbb45..b273f658b 100644
--- a/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_HK/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2013-05-29 08:13+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -71,623 +71,566 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, python-format
 msgid "Could not find parameter %(param)s"
 msgstr ""
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 msgid "Unknown Gluster exception"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1473,22 +1416,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1499,29 +1442,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2595,26 +2538,26 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3584,6 +3527,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3709,14 +3658,14 @@ msgstr ""
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3808,7 +3757,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6656,7 +6605,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6672,7 +6620,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6691,9 +6639,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6707,19 +6654,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6879,6 +6833,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6904,7 +6863,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6914,42 +6873,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6957,106 +6916,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7064,73 +7023,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7929,23 +7888,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8633,293 +8592,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9274,12 +9233,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9295,47 +9248,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9357,203 +9278,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""
 
diff --git a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
index d1aad5570..5a876415b 100644
--- a/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
+++ b/cinder/locale/zh_TW/LC_MESSAGES/cinder.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  cinder\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-09-12 06:06+0000\n"
+"POT-Creation-Date: 2013-09-15 06:06+0000\n"
 "PO-Revision-Date: 2012-03-07 02:00+0000\n"
 "Last-Translator: Charles Hsu <charles0126+openstack@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
@@ -70,625 +70,568 @@ msgstr ""
 
 #: cinder/exception.py:139
 #, python-format
-msgid "Invalid source volume %(reason)s."
-msgstr ""
-
-#: cinder/exception.py:143
-#, python-format
 msgid "Invalid attaching mode '%(mode)s' for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:148
+#: cinder/exception.py:144
 #, python-format
 msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
-#: cinder/exception.py:152
+#: cinder/exception.py:148
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: cinder/exception.py:156
-msgid "The request is invalid."
-msgstr ""
-
-#: cinder/exception.py:160
+#: cinder/exception.py:152
 msgid "The results are invalid."
 msgstr ""
 
-#: cinder/exception.py:164
+#: cinder/exception.py:156
 #, python-format
 msgid "Invalid input received: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:168
+#: cinder/exception.py:160
 #, python-format
 msgid "Invalid volume type: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:172
+#: cinder/exception.py:164
 #, python-format
 msgid "Invalid volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:176
+#: cinder/exception.py:168
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: cinder/exception.py:180
+#: cinder/exception.py:172
 #, python-format
 msgid "Invalid host: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:186 cinder/brick/exception.py:88
+#: cinder/exception.py:178 cinder/brick/exception.py:88
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: cinder/exception.py:190
+#: cinder/exception.py:182
 #, python-format
 msgid "Invalid auth key: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:194
+#: cinder/exception.py:186
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: cinder/exception.py:198
+#: cinder/exception.py:190
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:202
+#: cinder/exception.py:194
 #, python-format
 msgid "The device in the path %(path)s is unavailable: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:206
+#: cinder/exception.py:198
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: cinder/exception.py:210 cinder/brick/exception.py:75
+#: cinder/exception.py:202 cinder/brick/exception.py:75
 msgid "Resource could not be found."
 msgstr ""
 
-#: cinder/exception.py:216
-#, python-format
-msgid "Volume %(volume_id)s persistence file could not be found."
-msgstr ""
-
-#: cinder/exception.py:220
+#: cinder/exception.py:208
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:224
+#: cinder/exception.py:212
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: cinder/exception.py:229
+#: cinder/exception.py:217
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: cinder/exception.py:233
+#: cinder/exception.py:221
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:238
+#: cinder/exception.py:226
 #, python-format
 msgid ""
 "Volume %(volume_id)s has no administration metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:243 cinder/exception.py:256
+#: cinder/exception.py:231
 #, python-format
 msgid "Invalid metadata: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:247 cinder/exception.py:260
+#: cinder/exception.py:235
 #, python-format
 msgid "Invalid metadata size: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:251
+#: cinder/exception.py:239
 #, python-format
 msgid "Snapshot %(snapshot_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: cinder/exception.py:264
+#: cinder/exception.py:244
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:268
+#: cinder/exception.py:248
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:273
+#: cinder/exception.py:253
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:278
+#: cinder/exception.py:258
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s deletion is not allowed with volumes "
 "present with the type."
 msgstr ""
 
-#: cinder/exception.py:283
+#: cinder/exception.py:263
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:287
+#: cinder/exception.py:267
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: cinder/exception.py:291
+#: cinder/exception.py:271
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: cinder/exception.py:296
+#: cinder/exception.py:276
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:300
-#, python-format
-msgid "No disk at %(location)s"
-msgstr ""
-
-#: cinder/exception.py:304
+#: cinder/exception.py:280
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: cinder/exception.py:308
+#: cinder/exception.py:284
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:312
+#: cinder/exception.py:288
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:316
+#: cinder/exception.py:292
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:320
+#: cinder/exception.py:296
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:324
+#: cinder/exception.py:300
 #, python-format
 msgid "Scheduler Host Weigher %(weigher_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:328
+#: cinder/exception.py:304
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: cinder/exception.py:332
+#: cinder/exception.py:308
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: cinder/exception.py:336
+#: cinder/exception.py:312
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: cinder/exception.py:341
+#: cinder/exception.py:317
 msgid "Quota could not be found"
 msgstr ""
 
-#: cinder/exception.py:345
+#: cinder/exception.py:321
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: cinder/exception.py:349
+#: cinder/exception.py:325
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:353
+#: cinder/exception.py:329
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:357
+#: cinder/exception.py:333
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:361
+#: cinder/exception.py:337
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:365
+#: cinder/exception.py:341
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: cinder/exception.py:369
+#: cinder/exception.py:345
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:373
-#, python-format
-msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
-
-#: cinder/exception.py:378
+#: cinder/exception.py:349
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:382
-#, python-format
-msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
-
-#: cinder/exception.py:386
-msgid "Action not allowed."
-msgstr ""
-
-#: cinder/exception.py:395
-#, python-format
-msgid "Key pair %(key_name)s already exists."
-msgstr ""
-
-#: cinder/exception.py:399
+#: cinder/exception.py:358
 #, python-format
 msgid "Volume Type %(id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:403
+#: cinder/exception.py:362
 #, python-format
 msgid "Volume type encryption for type %(type_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:407
-#, python-format
-msgid "Migration error: %(reason)s"
-msgstr ""
-
-#: cinder/exception.py:411
+#: cinder/exception.py:366
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:415
+#: cinder/exception.py:370
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: cinder/exception.py:419
+#: cinder/exception.py:374
 #, fuzzy, python-format
 msgid "Could not find parameter %(param)s"
 msgstr "找不到Volume %s"
 
-#: cinder/exception.py:423
+#: cinder/exception.py:378
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: cinder/exception.py:427
+#: cinder/exception.py:382
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:431
+#: cinder/exception.py:386
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: cinder/exception.py:435
+#: cinder/exception.py:390
 #, python-format
 msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
-#: cinder/exception.py:442
+#: cinder/exception.py:397
 msgid "Requested volume or snapshot exceeds allowed Gigabytes quota"
 msgstr ""
 
-#: cinder/exception.py:447
-msgid "Maximum volume/snapshot size exceeded"
-msgstr ""
-
-#: cinder/exception.py:451
+#: cinder/exception.py:402
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:455
+#: cinder/exception.py:406
 #, python-format
 msgid "Maximum number of snapshots allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: cinder/exception.py:459
+#: cinder/exception.py:410
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: cinder/exception.py:463
-#, python-format
-msgid "3PAR Host already exists: %(err)s.  %(info)s"
-msgstr ""
-
-#: cinder/exception.py:467
+#: cinder/exception.py:414
 #, python-format
 msgid "Invalid 3PAR Domain: %(err)s"
 msgstr ""
 
-#: cinder/exception.py:471
+#: cinder/exception.py:418
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: cinder/exception.py:476
+#: cinder/exception.py:423
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: cinder/exception.py:480
+#: cinder/exception.py:427
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: cinder/exception.py:484
+#: cinder/exception.py:431
 #, python-format
 msgid "Unknown or unsupported command %(cmd)s"
 msgstr ""
 
-#: cinder/exception.py:488
+#: cinder/exception.py:435
 #, python-format
 msgid "Malformed response to command %(cmd)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:492
+#: cinder/exception.py:439
 #, python-format
 msgid "Bad HTTP response status %(status)s"
 msgstr ""
 
-#: cinder/exception.py:496
+#: cinder/exception.py:443
 #, python-format
 msgid "Operation failed with status=%(status)s. Full dump: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:500
+#: cinder/exception.py:447
 #, fuzzy, python-format
 msgid "Unable to create server object for initiator %(name)s"
 msgstr "無法替 instance實例 %(instance_name)s , 建立 VDI 在SR %(sr_ref)s"
 
-#: cinder/exception.py:504
+#: cinder/exception.py:451
 #, python-format
 msgid "Unable to find server object for initiator %(name)s"
 msgstr ""
 
-#: cinder/exception.py:508
+#: cinder/exception.py:455
 msgid "Unable to find any active VPSA controller"
 msgstr ""
 
-#: cinder/exception.py:512
+#: cinder/exception.py:459
 #, python-format
 msgid "Failed to retrieve attachments for volume %(name)s"
 msgstr ""
 
-#: cinder/exception.py:516
+#: cinder/exception.py:463
 #, python-format
 msgid "Invalid attachment info for volume %(name)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:520
+#: cinder/exception.py:467
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:524
+#: cinder/exception.py:471
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:476
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "發生一個未知例外"
 
-#: cinder/exception.py:533
+#: cinder/exception.py:480
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: cinder/exception.py:537 cinder/exception.py:549
+#: cinder/exception.py:484 cinder/exception.py:496
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:488
 #, fuzzy
 msgid "Unknown Gluster exception"
 msgstr "發生一個未知例外"
 
-#: cinder/exception.py:545
+#: cinder/exception.py:492
 msgid "No mounted Gluster shares found"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:500
 #, python-format
 msgid ""
 "Glance metadata cannot be updated, key %(key)s exists for volume id "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/exception.py:558
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:562
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:566
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:570
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:574
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:578
+#: cinder/exception.py:525
 #, fuzzy, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr "找不到Volume %s"
 
-#: cinder/exception.py:582
+#: cinder/exception.py:529
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:586
+#: cinder/exception.py:533
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:590
+#: cinder/exception.py:537
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:594
-#, python-format
-msgid "Backup volume %(volume_id)s type not recognised."
-msgstr ""
-
-#: cinder/exception.py:598
+#: cinder/exception.py:541
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:602
+#: cinder/exception.py:545
 #, python-format
 msgid "Invalid backup: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:606
+#: cinder/exception.py:549
 #, python-format
 msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:610
+#: cinder/exception.py:553
 #, python-format
 msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:614
+#: cinder/exception.py:557
 #, python-format
 msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:561
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:565
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:569
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:573
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:634
+#: cinder/exception.py:577
 msgid "Relogin on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:638
+#: cinder/exception.py:581
 #, python-format
 msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
-#: cinder/exception.py:642
+#: cinder/exception.py:585
 #, python-format
 msgid "ESM configure request failed: %(message)s."
 msgstr ""
 
-#: cinder/exception.py:646
+#: cinder/exception.py:589
 #, python-format
 msgid "Coraid ESM not available with reason: %(reason)s."
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:593
 #, python-format
 msgid "QoS Specs %(specs_id)s already exists."
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:597
 #, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:659
+#: cinder/exception.py:602
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:607
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:611
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:673
+#: cinder/exception.py:616
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:678
+#: cinder/exception.py:621
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:683
+#: cinder/exception.py:626
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:687
+#: cinder/exception.py:630
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
@@ -1474,22 +1417,22 @@ msgstr ""
 msgid "vol=%s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:276 cinder/api/v2/volumes.py:220
+#: cinder/api/v1/volumes.py:283 cinder/api/v2/volumes.py:227
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:327 cinder/api/v1/volumes.py:331
-#: cinder/api/v2/volumes.py:287 cinder/api/v2/volumes.py:291
+#: cinder/api/v1/volumes.py:336 cinder/api/v1/volumes.py:340
+#: cinder/api/v2/volumes.py:296 cinder/api/v2/volumes.py:300
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: cinder/api/v1/volumes.py:389 cinder/api/v2/volumes.py:352
+#: cinder/api/v1/volumes.py:398 cinder/api/v2/volumes.py:361
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: cinder/api/v1/volumes.py:473
+#: cinder/api/v1/volumes.py:482
 #, python-format
 msgid "Removing options '%(bad_options)s' from query"
 msgstr ""
@@ -1500,29 +1443,29 @@ msgid "Snapshot could not be found"
 msgstr ""
 
 #: cinder/api/v2/snapshots.py:174 cinder/api/v2/snapshots.py:225
-#: cinder/api/v2/volumes.py:302 cinder/api/v2/volumes.py:396
+#: cinder/api/v2/volumes.py:311 cinder/api/v2/volumes.py:405
 #, python-format
 msgid "Missing required element '%s' in request body"
 msgstr ""
 
-#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:392
+#: cinder/api/v2/snapshots.py:221 cinder/api/v2/volumes.py:401
 msgid "Missing request body"
 msgstr ""
 
-#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:327
+#: cinder/api/v2/types.py:72 cinder/api/v2/volumes.py:336
 msgid "Volume type not found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:209 cinder/api/v2/volumes.py:226
-#: cinder/api/v2/volumes.py:426
+#: cinder/api/v2/volumes.py:216 cinder/api/v2/volumes.py:233
+#: cinder/api/v2/volumes.py:435
 msgid "Volume could not be found"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:229
+#: cinder/api/v2/volumes.py:236
 msgid "Volume cannot be deleted while in attached state"
 msgstr ""
 
-#: cinder/api/v2/volumes.py:449
+#: cinder/api/v2/volumes.py:458
 #, python-format
 msgid "Removing options '%s' from query"
 msgstr ""
@@ -2600,27 +2543,27 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1894
+#: cinder/db/sqlalchemy/api.py:1896
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2566
+#: cinder/db/sqlalchemy/api.py:2568
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2652
+#: cinder/db/sqlalchemy/api.py:2654
 #, fuzzy
 msgid "Volume must be available"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/db/sqlalchemy/api.py:2676
+#: cinder/db/sqlalchemy/api.py:2678
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2699
+#: cinder/db/sqlalchemy/api.py:2701
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
@@ -3591,6 +3534,12 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
+#: cinder/tests/test_create_volume_flow.py:101
+#: cinder/volume/flows/create_volume/__init__.py:158
+#, python-format
+msgid "Caught '%(exception)s' exception."
+msgstr ""
+
 #: cinder/tests/test_misc.py:59
 #, python-format
 msgid ""
@@ -3717,14 +3666,14 @@ msgstr "找不到Volume %s"
 msgid "Attempt to transfer %s with invalid auth key."
 msgstr ""
 
-#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:613
+#: cinder/transfer/api.py:158 cinder/volume/flows/create_volume/__init__.py:630
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create %(s_size)sG volume "
 "(%(d_consumed)dG of %(d_quota)dG already consumed)"
 msgstr ""
 
-#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:622
+#: cinder/transfer/api.py:167 cinder/volume/flows/create_volume/__init__.py:639
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create volume (%(d_consumed)d "
@@ -3818,7 +3767,7 @@ msgstr ""
 msgid "Volume Snapshot status must be available or error"
 msgstr "Volume 狀態需要可被使用"
 
-#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:323
+#: cinder/volume/api.py:580 cinder/volume/flows/create_volume/__init__.py:336
 msgid "Metadata property key blank"
 msgstr ""
 
@@ -6674,7 +6623,6 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_dorado.py:76
-#: cinder/volume/drivers/huawei/huawei_t.py:434
 #, python-format
 msgid ""
 "initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
@@ -6690,7 +6638,7 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:98
 #, python-format
 msgid ""
-"initialize_connection: volume name: %(vol)s host: %(host)s initiator: "
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
 "%(ini)s"
 msgstr ""
 
@@ -6709,9 +6657,8 @@ msgid "_get_tgt_iqn: iSCSI IP is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:230
-#: cinder/volume/drivers/huawei/rest_common.py:1096
 #, python-format
-msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgid "_get_tgt_iqn: iSCSI target iqn is %s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:244
@@ -6725,19 +6672,26 @@ msgstr ""
 #: cinder/volume/drivers/huawei/huawei_t.py:543
 #, python-format
 msgid ""
-"terminate_connection: volume: %(vol)s host: %(host)s connector: "
+"terminate_connection: volume: %(vol)s, host: %(host)s, connector: "
 "%(initiator)s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:346
 #, python-format
-msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
+msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/huawei_t.py:427
 msgid "validate_connector: The FC driver requires thewwpns in the connector."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:434
+#, python-format
+msgid ""
+"initialize_connection: volume name: %(vol)s, host: %(host)s, initiator: "
+"%(wwn)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_t.py:569
 #, python-format
 msgid "_remove_fc_ports: FC port was not found on host %(hostid)s."
@@ -6897,6 +6851,11 @@ msgstr ""
 msgid "new str info is %s."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/rest_common.py:1096
+#, python-format
+msgid "_get_tgt_iqn: iSCSI target iqn is %s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/rest_common.py:1122
 #, python-format
 msgid "_parse_volume_type: type id: %(type_id)s config parameter is: %(params)s"
@@ -6922,7 +6881,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:1246
-#: cinder/volume/drivers/huawei/ssh_common.py:133
+#: cinder/volume/drivers/huawei/ssh_common.py:136
 msgid "_check_conf_file: Config file invalid. StoragePool must be set."
 msgstr ""
 
@@ -6932,42 +6891,42 @@ msgid "parse_xml_file: %s"
 msgstr ""
 
 #: cinder/volume/drivers/huawei/ssh_common.py:66
-msgid "ssh_read: Read SSH timeout"
+msgid "ssh_read: Read SSH timeout."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:82
+#: cinder/volume/drivers/huawei/ssh_common.py:81
 msgid "No response message. Please check system status."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:107
-#: cinder/volume/drivers/huawei/ssh_common.py:1147
-msgid "do_setup."
+#: cinder/volume/drivers/huawei/ssh_common.py:110
+#: cinder/volume/drivers/huawei/ssh_common.py:1150
+msgid "do_setup"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:124
+#: cinder/volume/drivers/huawei/ssh_common.py:127
 msgid ""
 "_check_conf_file: Config file invalid. Controler IP, UserName and "
 "UserPassword must be set."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:165
+#: cinder/volume/drivers/huawei/ssh_common.py:168
 #, python-format
 msgid "_get_login_info: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:211
+#: cinder/volume/drivers/huawei/ssh_common.py:214
 #, python-format
-msgid "create_volume: volume name: %s."
+msgid "create_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:229
+#: cinder/volume/drivers/huawei/ssh_common.py:232
 #, python-format
 msgid ""
 "_name_translate: Name in cinder: %(old)s, new name in storage system: "
 "%(new)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:266
+#: cinder/volume/drivers/huawei/ssh_common.py:269
 #, python-format
 msgid ""
 "_parse_volume_type: Unacceptable parameter %(key)s. Please check this key"
@@ -6975,106 +6934,106 @@ msgid ""
 "file %(conf)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:360
-#: cinder/volume/drivers/huawei/ssh_common.py:1316
+#: cinder/volume/drivers/huawei/ssh_common.py:363
+#: cinder/volume/drivers/huawei/ssh_common.py:1319
 #, python-format
 msgid "LUNType must be \"Thin\" or \"Thick\". LUNType:%(type)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:381
+#: cinder/volume/drivers/huawei/ssh_common.py:384
 msgid ""
 "_parse_conf_lun_params: Use default prefetch type. Prefetch type: "
-"Intelligent."
+"Intelligent"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:407
+#: cinder/volume/drivers/huawei/ssh_common.py:410
 #, python-format
 msgid ""
 "_get_maximum_capacity_pool_id: Failed to get pool id. Please check config"
 " file and make sure the StoragePool %s is created in storage array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:421
+#: cinder/volume/drivers/huawei/ssh_common.py:424
 #, python-format
 msgid "CLI command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:451
+#: cinder/volume/drivers/huawei/ssh_common.py:454
 #, python-format
 msgid ""
 "_execute_cli: Can not connect to IP %(old)s, try to connect to the other "
 "IP %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:495
+#: cinder/volume/drivers/huawei/ssh_common.py:498
 #, python-format
-msgid "delete_volume: volume name: %s."
+msgid "delete_volume: volume name: %s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:502
+#: cinder/volume/drivers/huawei/ssh_common.py:505
 #, python-format
 msgid "delete_volume: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:532
+#: cinder/volume/drivers/huawei/ssh_common.py:535
 #, python-format
 msgid ""
 "create_volume_from_snapshot: snapshot name: %(snapshot)s, volume name: "
-"%(volume)s."
+"%(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:542
+#: cinder/volume/drivers/huawei/ssh_common.py:545
 #, python-format
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:612
+#: cinder/volume/drivers/huawei/ssh_common.py:615
 #, python-format
 msgid "_wait_for_luncopy: LUNcopy %(luncopyname)s status is %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:650
+#: cinder/volume/drivers/huawei/ssh_common.py:653
 #, python-format
-msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
+msgid "create_cloned_volume: src volume: %(src)s, tgt volume: %(tgt)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:659
+#: cinder/volume/drivers/huawei/ssh_common.py:662
 #, python-format
 msgid "Source volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:697
+#: cinder/volume/drivers/huawei/ssh_common.py:700
 #, python-format
-msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "create_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:703
+#: cinder/volume/drivers/huawei/ssh_common.py:706
 msgid "create_snapshot: Resource pool needs 1GB valid size at least."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:710
+#: cinder/volume/drivers/huawei/ssh_common.py:713
 #, python-format
 msgid "create_snapshot: Volume %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:773
+#: cinder/volume/drivers/huawei/ssh_common.py:776
 #, python-format
-msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
+msgid "delete_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:783
+#: cinder/volume/drivers/huawei/ssh_common.py:786
 #, python-format
 msgid ""
 "delete_snapshot: Can not delete snapshot %s for it is a source LUN of "
 "LUNCopy."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:791
+#: cinder/volume/drivers/huawei/ssh_common.py:794
 #, python-format
 msgid "delete_snapshot: Snapshot %(snap)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:834
+#: cinder/volume/drivers/huawei/ssh_common.py:837
 #, python-format
 msgid ""
 "%(func)s: %(msg)s\n"
@@ -7082,73 +7041,73 @@ msgid ""
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:984
+#: cinder/volume/drivers/huawei/ssh_common.py:987
 #, python-format
-msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
+msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1000
+#: cinder/volume/drivers/huawei/ssh_common.py:1003
 #, python-format
 msgid "remove_map: Host %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1004
+#: cinder/volume/drivers/huawei/ssh_common.py:1007
 #, python-format
 msgid "remove_map: Volume %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1017
+#: cinder/volume/drivers/huawei/ssh_common.py:1020
 #, python-format
 msgid "remove_map: No map between host %(host)s and volume %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1036
+#: cinder/volume/drivers/huawei/ssh_common.py:1039
 #, python-format
 msgid ""
 "_delete_map: There are IOs accessing the system. Retry to delete host map"
 " %(mapid)s 10s later."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1044
+#: cinder/volume/drivers/huawei/ssh_common.py:1047
 #, python-format
 msgid ""
 "_delete_map: Failed to delete host map %(mapid)s.\n"
 "CLI out: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1083
-msgid "_update_volume_stats: Updating volume stats"
+#: cinder/volume/drivers/huawei/ssh_common.py:1086
+msgid "_update_volume_stats: Updating volume stats."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1161
+#: cinder/volume/drivers/huawei/ssh_common.py:1164
 msgid ""
 "Config file invalid. Controler IP, UserName, UserPassword must be "
 "specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1173
+#: cinder/volume/drivers/huawei/ssh_common.py:1176
 msgid "_check_conf_file: Config file invalid. StoragePool must be specified."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1195
+#: cinder/volume/drivers/huawei/ssh_common.py:1198
 msgid ""
-"_get_device_type: The drivers only supportDorado5100 and Dorado 2100 G2 "
+"_get_device_type: The driver only supports Dorado5100 and Dorado 2100 G2 "
 "now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1263
+#: cinder/volume/drivers/huawei/ssh_common.py:1266
 #, python-format
 msgid ""
 "create_volume_from_snapshot: %(device)s does not support create volume "
 "from snapshot."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1270
+#: cinder/volume/drivers/huawei/ssh_common.py:1273
 #, python-format
 msgid "create_cloned_volume: %(device)s does not support clone volume."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/ssh_common.py:1278
+#: cinder/volume/drivers/huawei/ssh_common.py:1281
 #, python-format
 msgid "create_snapshot: %(device)s does not support snapshot."
 msgstr ""
@@ -7947,23 +7906,23 @@ msgstr ""
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:111
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:122
 #, python-format
 msgid "Invalid IP address format '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:145
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:156
 #, python-format
 msgid ""
 "Found invalid iSCSI IP address(s) in configuration option(s) "
 "hp3par_iscsi_ips or iscsi_ip_address '%s.'"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:151
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:162
 msgid "At least one valid iSCSI IP address must be set."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:350
+#: cinder/volume/drivers/san/hp/hp_3par_iscsi.py:375
 msgid "Least busy iSCSI port not found, using first iSCSI port in list."
 msgstr ""
 
@@ -8651,293 +8610,293 @@ msgstr ""
 msgid "%(flow)s has moved %(runner)s into state %(state)s with result: %(result)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:107
+#: cinder/volume/flows/create_volume/__init__.py:108
 #, python-format
 msgid "Restoring source %(source_volid)s status to %(status)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:113
+#: cinder/volume/flows/create_volume/__init__.py:114
 #, python-format
 msgid ""
 "Failed setting source volume %(source_volid)s back to its initial "
 "%(source_status)s status"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:138
+#: cinder/volume/flows/create_volume/__init__.py:139
 #, python-format
 msgid "Updating volume: %(volume_id)s with %(update)s due to: %(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:145
-#: cinder/volume/flows/create_volume/__init__.py:1517
+#: cinder/volume/flows/create_volume/__init__.py:146
+#: cinder/volume/flows/create_volume/__init__.py:1538
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:196
+#: cinder/volume/flows/create_volume/__init__.py:209
 #, python-format
 msgid "Originating snapshot status must be one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:218
+#: cinder/volume/flows/create_volume/__init__.py:231
 #, python-format
 msgid ""
 "Unable to create a volume from an originating source volume when its "
 "status is not one of %s values"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:241
+#: cinder/volume/flows/create_volume/__init__.py:254
 #, python-format
 msgid ""
 "Volume size %(size)s cannot be lesser than the snapshot size "
 "%(snap_size)s. They must be >= original snapshot size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:250
+#: cinder/volume/flows/create_volume/__init__.py:263
 #, python-format
 msgid ""
 "Clones currently disallowed when %(size)s < %(source_size)s. They must be"
 " >= original volume size."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:259
+#: cinder/volume/flows/create_volume/__init__.py:272
 #, python-format
 msgid "Volume size %(size)s must be an integer and greater than 0"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:301
+#: cinder/volume/flows/create_volume/__init__.py:314
 #, python-format
 msgid ""
 "Size of specified image %(image_size)s is larger than volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:309
+#: cinder/volume/flows/create_volume/__init__.py:322
 #, python-format
 msgid ""
 "Image minDisk size %(min_disk)s is larger than the volume size "
 "%(volume_size)s."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:327
+#: cinder/volume/flows/create_volume/__init__.py:340
 #, python-format
 msgid "Metadata property key %s greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:332
+#: cinder/volume/flows/create_volume/__init__.py:345
 #, python-format
 msgid "Metadata property key %s value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:365
+#: cinder/volume/flows/create_volume/__init__.py:382
 #, python-format
 msgid "Availability zone '%s' is invalid"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:378
+#: cinder/volume/flows/create_volume/__init__.py:395
 msgid "Volume must be in the same availability zone as the snapshot"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:387
+#: cinder/volume/flows/create_volume/__init__.py:404
 msgid "Volume must be in the same availability zone as the source volume"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:426
+#: cinder/volume/flows/create_volume/__init__.py:443
 msgid "Volume type will be changed to be the same as the source volume."
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:568
+#: cinder/volume/flows/create_volume/__init__.py:585
 #, python-format
 msgid "Failed destroying volume entry %s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:645
+#: cinder/volume/flows/create_volume/__init__.py:662
 #, python-format
 msgid "Failed rolling back quota for %s reservations"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:783
-#: cinder/volume/flows/create_volume/__init__.py:927
+#: cinder/volume/flows/create_volume/__init__.py:800
+#: cinder/volume/flows/create_volume/__init__.py:945
 #, python-format
 msgid "Volume %s: create failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:787
-#: cinder/volume/flows/create_volume/__init__.py:944
+#: cinder/volume/flows/create_volume/__init__.py:804
+#: cinder/volume/flows/create_volume/__init__.py:962
 msgid "Unexpected build error:"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:867
+#: cinder/volume/flows/create_volume/__init__.py:884
 #, python-format
 msgid ""
 "Volume %(volume_id)s: re-scheduling %(method)s attempt %(num)d due to "
 "%(reason)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:884
+#: cinder/volume/flows/create_volume/__init__.py:902
 #, python-format
 msgid "Volume %s: re-scheduled"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:901
+#: cinder/volume/flows/create_volume/__init__.py:919
 #, python-format
 msgid "Updating volume %(volume_id)s with %(update)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:906
+#: cinder/volume/flows/create_volume/__init__.py:924
 #, python-format
 msgid "Volume %s: resetting 'creating' status failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:923
+#: cinder/volume/flows/create_volume/__init__.py:941
 #, python-format
 msgid ""
 "Failing volume %s creation by altering volume status instead of "
 "rescheduling"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:938
+#: cinder/volume/flows/create_volume/__init__.py:956
 #, python-format
 msgid "Volume %s: rescheduling failed"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:983
-#: cinder/volume/flows/create_volume/__init__.py:1630
+#: cinder/volume/flows/create_volume/__init__.py:1001
+#: cinder/volume/flows/create_volume/__init__.py:1651
 #, python-format
 msgid "Failed notifying on %(topic)s payload %(payload)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1011
+#: cinder/volume/flows/create_volume/__init__.py:1029
 msgid "No volume_id provided to populate a request_spec from"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1165
+#: cinder/volume/flows/create_volume/__init__.py:1183
 #, python-format
 msgid ""
 "Failed notifying about the volume action %(event)s for volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1201
+#: cinder/volume/flows/create_volume/__init__.py:1219
 #, python-format
 msgid "Copying metadata from %(src_type)s %(src_id)s to %(vol_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1203
+#: cinder/volume/flows/create_volume/__init__.py:1221
 #, python-format
 msgid ""
 "Failed updating volume %(vol_id)s metadata using the provided "
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1261
+#: cinder/volume/flows/create_volume/__init__.py:1279
 #, python-format
 msgid ""
 "Failed fetching snapshot %(snapshot_id)s bootable flag using the provided"
 " glance snapshot %(snapshot_ref_id)s volume reference"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1274
+#: cinder/volume/flows/create_volume/__init__.py:1292
 #, python-format
 msgid "Marking volume %s as bootable"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1277
+#: cinder/volume/flows/create_volume/__init__.py:1295
 #, python-format
 msgid "Failed updating volume %(volume_id)s bootable flag to true"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1304
+#: cinder/volume/flows/create_volume/__init__.py:1322
 #, python-format
 msgid ""
 "Attempting download of %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1311
-#: cinder/volume/flows/create_volume/__init__.py:1322
+#: cinder/volume/flows/create_volume/__init__.py:1329
+#: cinder/volume/flows/create_volume/__init__.py:1340
 #, python-format
 msgid ""
 "Failed to copy image %(image_id)s to volume: %(volume_id)s, error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1317
+#: cinder/volume/flows/create_volume/__init__.py:1335
 #, python-format
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1328
+#: cinder/volume/flows/create_volume/__init__.py:1349
 #, python-format
 msgid ""
 "Downloaded image %(image_id)s (%(image_location)s) to volume "
 "%(volume_id)s successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1365
+#: cinder/volume/flows/create_volume/__init__.py:1386
 #, python-format
 msgid ""
 "Creating volume glance metadata for volume %(volume_id)s backed by image "
 "%(image_id)s with: %(vol_metadata)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1379
+#: cinder/volume/flows/create_volume/__init__.py:1400
 #, python-format
 msgid ""
 "Cloning %(volume_id)s from image %(image_id)s  at location "
 "%(image_location)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1405
+#: cinder/volume/flows/create_volume/__init__.py:1426
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1430
+#: cinder/volume/flows/create_volume/__init__.py:1451
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created using %(functor)s with specification:"
 " %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1453
+#: cinder/volume/flows/create_volume/__init__.py:1474
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with creation provided "
 "model %(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1461
+#: cinder/volume/flows/create_volume/__init__.py:1482
 #, python-format
 msgid "Volume %s: creating export"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1475
+#: cinder/volume/flows/create_volume/__init__.py:1496
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1521
+#: cinder/volume/flows/create_volume/__init__.py:1542
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1611
+#: cinder/volume/flows/create_volume/__init__.py:1632
 #, python-format
 msgid "Failed to schedule_create_volume: %(cause)s"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1686
+#: cinder/volume/flows/create_volume/__init__.py:1707
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1689
+#: cinder/volume/flows/create_volume/__init__.py:1710
 msgid "No retry filter property or associated retry info, will not reschedule"
 msgstr ""
 
-#: cinder/volume/flows/create_volume/__init__.py:1710
+#: cinder/volume/flows/create_volume/__init__.py:1731
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
@@ -9292,12 +9251,6 @@ msgstr ""
 #~ msgid "check_for_setup_error: Device type is:%(type)s, version is:%(version)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "check_for_setup_error: Product version not "
-#~ "right. Please make sure the product "
-#~ "version is V1."
-#~ msgstr ""
-
 #~ msgid "_get_device_type: Storage Pool must be configured."
 #~ msgstr ""
 
@@ -9313,47 +9266,15 @@ msgstr ""
 #~ msgid "create_export:Volume %(name)s does not exist."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection: volume name: %(volume)s. "
-#~ "initiator name: %(ini)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find target ip"
-#~ " for initiator:%(initiatorname)s, please check"
-#~ " config file."
-#~ msgstr ""
-
 #~ msgid "initialize_connection:Failed to find target iSCSI iqn. Target IP:%(ip)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "initialize_connection:host name: %(host)s, initiator"
-#~ " name: %(ini)s, hostport name: %(port)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "initialize_connection:Failed to find the given"
-#~ " volume. volume name:%(volume)s."
-#~ msgstr ""
-
 #~ msgid "terminate_connection:Host does not exist. Host name:%(host)s."
 #~ msgstr ""
 
 #~ msgid "terminate_connection:volume does not exist. volume name:%(volume)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "terminate_connection:No map between host and"
-#~ " volume. Host name:%(hostname)s, volume "
-#~ "name:%(volumename)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "terminate_connection:No initiator is added to"
-#~ " the host. Host name:%(hostname)s"
-#~ msgstr ""
-
 #~ msgid "create_snapshot:Device does not support snapshot."
 #~ msgstr ""
 
@@ -9375,203 +9296,154 @@ msgstr ""
 #~ msgid "delete_snapshot:Snapshot does not exist. snapshot name:%(snap)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:snapshot name:%(snapshot)s, "
-#~ "volume name:%(volume)s."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "create_volume_from_snapshot:Device does not support"
-#~ " create volume from snapshot. Volume "
-#~ "name:%(volume)s, snapshot name:%(snapshot)s."
+#~ msgid "_check_conf_file: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "create_volume_from_snapshot:Snapshot does not exist."
-#~ " Snapshot name:%(name)s"
+#~ msgid "Write login information to xml error. %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. Controler IP, "
-#~ "UserName and UserPassword must be set."
+#~ msgid "_get_login_info error. %s"
 #~ msgstr ""
 
-#~ msgid "_check_conf_file: %s"
+#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
 #~ msgstr ""
 
-#~ msgid "Write login information to xml error. %s"
+#~ msgid "_get_lun_set_info:%s"
 #~ msgstr ""
 
-#~ msgid "_get_login_info error. %s"
+#~ msgid "_get_iscsi_info:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Config file is wrong. LUNType must "
-#~ "be \"Thin\"  or \"Thick\". LUNType:%(type)s"
+#~ msgid "CLI command:%s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:Use default prefetch type. Prefetch type:Intelligent."
+#~ msgid "_execute_cli:%s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_lun_set_info:No available pools! Please "
-#~ "check whether storage pool is created."
+#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
 #~ msgstr ""
 
-#~ msgid "_get_lun_set_info:%s"
+#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_get_maximum_pool:maxpoolid is None. Please "
-#~ "check config file and make sure "
-#~ "the \"Name\" in \"StoragePool\" is "
-#~ "right."
+#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
 #~ msgstr ""
 
-#~ msgid "_get_iscsi_info:%s"
+#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "CLI command:%s"
+#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
 #~ msgstr ""
 
-#~ msgid "_execute_cli:%s"
+#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_name_translate:Name in cinder: %(old)s, new"
-#~ " name in storage system: %(new)s"
+#~ msgid "Ignored target creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_hostgroup:Failed to Create hostgroup. "
-#~ "Hostgroup name: %(name)s. out:%(out)s."
+#~ msgid "Ignored target group creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_host:Failed to add host to "
-#~ "hostgroup. host name:%(host)s hostgroup "
-#~ "id:%(hostgroup)s out:%(out)s"
+#~ msgid "Ignored target group member addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_initiator:Failed to add initiator. "
-#~ "initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LU creation error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_initiator:ERROE:Failed to delete initiator."
-#~ " initiator name:%(name)s out:%(out)s"
+#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_add_hostport:Failed to add hostport. port "
-#~ "name:%(port)s port information:%(info)s host "
-#~ "id:%(host)s out:%(out)s"
+#~ msgid "Invalid source volume %(reason)s."
 #~ msgstr ""
 
-#~ msgid "_delete_hostport:Failed to delete host port. port id:%(portid)s"
+#~ msgid "The request is invalid."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI IP is %s."
+#~ msgid "Volume %(volume_id)s persistence file could not be found."
 #~ msgstr ""
 
-#~ msgid "_get_tgt_iqn:iSCSI target iqn is:%s"
+#~ msgid "No disk at %(location)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_map_lun:Failed to add hostmap. "
-#~ "hostid:%(host)s lunid:%(lun)s hostlunid:%(hostlunid)s "
-#~ "out:%(out)s"
+#~ "Migration not found for instance "
+#~ "%(instance_id)s with status %(status)s."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_map:There are IOs accessing the "
-#~ "system. Retry to delete host map. "
-#~ "map id:%(mapid)s"
+#~ msgid "Class %(class_name)s could not be found: %(exception)s"
 #~ msgstr ""
 
-#~ msgid "_delete_map:Failed to delete host map. mapid:%(mapid)s out:%(out)s"
+#~ msgid "Action not allowed."
 #~ msgstr ""
 
-#~ msgid "_delete_host: Failed delete host. host id:%(hostid)s out:%(out)s"
+#~ msgid "Key pair %(key_name)s already exists."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_active_snapshot:Failed to active snapshot. "
-#~ "snapshot id:%(name)s. out:%(out)s"
+#~ msgid "Migration error: %(reason)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_disable_snapshot:Failed to disable snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "Maximum volume/snapshot size exceeded"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_snapshot:Failed to delete snapshot. "
-#~ "snapshot id:%(id)s. out:%(out)s"
+#~ msgid "3PAR Host already exists: %(err)s.  %(info)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_volume:Failed to Create volume. volume"
-#~ " name:%(name)s. out:%(out)s"
+#~ msgid "Backup volume %(volume_id)s type not recognised."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_delete_volume:Failed to delete volume. Volume"
-#~ " name:%(name)s out:%(out)s"
+#~ "initialize_connection: volume name: %(vol)s "
+#~ "host: %(host)s initiator: %(ini)s"
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_create_luncopy:Failed to Create LUNcopy. "
-#~ "LUNcopy name:%(name)s out:%(out)s"
+#~ "terminate_connection: volume: %(vol)s host: "
+#~ "%(host)s connector: %(initiator)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_start_luncopy:Failed to start LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "_remove_iscsi_port: iSCSI port was not found on host %(hostid)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_wait_for_luncopy:LUNcopy status is not "
-#~ "normal. LUNcopy name:%(luncopyname)s"
+#~ msgid "ssh_read: Read SSH timeout"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_delete_luncopy:Failed to delete LUNcopy. "
-#~ "LUNcopy id:%(luncopyid)s out:%(out)s"
+#~ msgid "do_setup."
 #~ msgstr ""
 
-#~ msgid ""
-#~ "_create_snapshot:Failed to Create snapshot. "
-#~ "Snapshot name:%(name)s out:%(out)s"
+#~ msgid "create_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "_change_lun_controller:Failed to change lun "
-#~ "owning controller. lun id:%(lunid)s. new "
-#~ "controller:%(controller)s. out:%(out)s"
+#~ "_parse_conf_lun_params: Use default prefetch "
+#~ "type. Prefetch type: Intelligent."
 #~ msgstr ""
 
-#~ msgid "_is_resource_pool_enough:Resource pool for snapshot not be added."
+#~ msgid "delete_volume: volume name: %s."
 #~ msgstr ""
 
 #~ msgid ""
-#~ "Cloning with params volume %(volume)s,src %(src_path)s,\n"
-#~ "                    dest %(dest_path)s, vserver %(vserver)s"
+#~ "create_volume_from_snapshot: snapshot name: "
+#~ "%(snapshot)s, volume name: %(volume)s."
 #~ msgstr ""
 
-#~ msgid "Ignored target creation error while ensuring export"
+#~ msgid "create_cloned_volume: src volume: %(src)s tgt volume: %(tgt)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group creation error while ensuring export"
+#~ msgid "create_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored target group member addition error while ensuring export"
+#~ msgid "delete_snapshot: snapshot name: %(snapshot)s volume name: %(volume)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LU creation error while ensuring export"
+#~ msgid "change_lun_ctr: Changing LUN %(lun)s ctr to %(ctr)s"
 #~ msgstr ""
 
-#~ msgid "Ignored LUN mapping entry addition error while ensuring export"
+#~ msgid "_update_volume_stats: Updating volume stats"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "_get_device_type: The drivers only "
+#~ "supportDorado5100 and Dorado 2100 G2 "
+#~ "now."
 #~ msgstr ""