diff --git a/cinder/locale/cinder-log-error.pot b/cinder/locale/cinder-log-error.pot
index 24da35ba5db..2874121414e 100644
--- a/cinder/locale/cinder-log-error.pot
+++ b/cinder/locale/cinder-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2015.1.dev158\n"
+"Project-Id-Version: cinder 2015.1.dev303\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-01-15 06:09+0000\n"
+"POT-Creation-Date: 2015-01-30 06:25+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"
@@ -31,7 +31,7 @@ msgstr ""
 msgid "Failed to roll back reservations %s"
 msgstr ""
 
-#: cinder/utils.py:617
+#: cinder/utils.py:618
 #, python-format
 msgid "Volume driver %s not initialized"
 msgstr ""
@@ -147,82 +147,82 @@ msgstr ""
 msgid "SDS CLI output some log: %s."
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:77
+#: cinder/brick/local_dev/lvm.py:79
 msgid "Error creating Volume Group"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:78 cinder/brick/local_dev/lvm.py:160
-#: cinder/brick/local_dev/lvm.py:507 cinder/brick/local_dev/lvm.py:537
-#: cinder/brick/local_dev/lvm.py:580 cinder/brick/local_dev/lvm.py:661
-#: cinder/brick/local_dev/lvm.py:699 cinder/volume/drivers/srb.py:124
+#: cinder/brick/local_dev/lvm.py:80 cinder/brick/local_dev/lvm.py:162
+#: cinder/brick/local_dev/lvm.py:546 cinder/brick/local_dev/lvm.py:577
+#: cinder/brick/local_dev/lvm.py:620 cinder/brick/local_dev/lvm.py:701
+#: cinder/brick/local_dev/lvm.py:739 cinder/volume/drivers/srb.py:124
 #: cinder/volume/drivers/srb.py:144 cinder/volume/drivers/srb.py:162
 #: cinder/volume/drivers/srb.py:180 cinder/volume/drivers/srb.py:206
 #, python-format
 msgid "Cmd     :%s"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:79 cinder/brick/local_dev/lvm.py:161
-#: cinder/brick/local_dev/lvm.py:508 cinder/brick/local_dev/lvm.py:538
-#: cinder/brick/local_dev/lvm.py:581 cinder/brick/local_dev/lvm.py:662
-#: cinder/brick/local_dev/lvm.py:700 cinder/volume/drivers/srb.py:125
+#: cinder/brick/local_dev/lvm.py:81 cinder/brick/local_dev/lvm.py:163
+#: cinder/brick/local_dev/lvm.py:547 cinder/brick/local_dev/lvm.py:578
+#: cinder/brick/local_dev/lvm.py:621 cinder/brick/local_dev/lvm.py:702
+#: cinder/brick/local_dev/lvm.py:740 cinder/volume/drivers/srb.py:125
 #: cinder/volume/drivers/srb.py:145 cinder/volume/drivers/srb.py:163
 #: cinder/volume/drivers/srb.py:181 cinder/volume/drivers/srb.py:207
 #, python-format
 msgid "StdOut  :%s"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:80 cinder/brick/local_dev/lvm.py:162
-#: cinder/brick/local_dev/lvm.py:509 cinder/brick/local_dev/lvm.py:539
-#: cinder/brick/local_dev/lvm.py:582 cinder/brick/local_dev/lvm.py:663
-#: cinder/brick/local_dev/lvm.py:701 cinder/volume/drivers/srb.py:126
+#: cinder/brick/local_dev/lvm.py:82 cinder/brick/local_dev/lvm.py:164
+#: cinder/brick/local_dev/lvm.py:548 cinder/brick/local_dev/lvm.py:579
+#: cinder/brick/local_dev/lvm.py:622 cinder/brick/local_dev/lvm.py:703
+#: cinder/brick/local_dev/lvm.py:741 cinder/volume/drivers/srb.py:126
 #: cinder/volume/drivers/srb.py:146 cinder/volume/drivers/srb.py:164
 #: cinder/volume/drivers/srb.py:182 cinder/volume/drivers/srb.py:208
 #, python-format
 msgid "StdErr  :%s"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:84
+#: cinder/brick/local_dev/lvm.py:86
 #, python-format
 msgid "Unable to locate Volume Group %s"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:159
+#: cinder/brick/local_dev/lvm.py:161
 msgid "Error querying thin pool about data_percent"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:397
+#: cinder/brick/local_dev/lvm.py:401
 #, python-format
 msgid "Unable to find VG: %s"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:449
+#: cinder/brick/local_dev/lvm.py:488
 msgid ""
 "Requested to setup thin provisioning, however current LVM version does "
 "not support it."
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:506
+#: cinder/brick/local_dev/lvm.py:545
 msgid "Error creating Volume"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:522
+#: cinder/brick/local_dev/lvm.py:562
 #, python-format
 msgid "Trying to create snapshot by non-existent LV: %s"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:536
+#: cinder/brick/local_dev/lvm.py:576
 msgid "Error creating snapshot"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:579
+#: cinder/brick/local_dev/lvm.py:619
 msgid "Error activating LV"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:660
+#: cinder/brick/local_dev/lvm.py:700
 msgid "Error extending Volume"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:698
+#: cinder/brick/local_dev/lvm.py:738
 msgid "Error renaming logical volume"
 msgstr ""
 
@@ -292,19 +292,20 @@ msgstr ""
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:128
-msgid "Dropping foreign key reservations_ibfk_1 failed."
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:135
+#, python-format
+msgid "Dropping foreign key %s failed."
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:134
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:142
 msgid "quota_classes table not dropped"
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:141
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:149
 msgid "quota_usages table not dropped"
 msgstr ""
 
-#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:148
+#: cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py:156
 msgid "reservations table not dropped"
 msgstr ""
 
@@ -444,7 +445,19 @@ msgstr ""
 msgid "Failed to update quota for deleting volume"
 msgstr ""
 
-#: cinder/volume/api.py:1241
+#: cinder/volume/api.py:782
+#, python-format
+msgid ""
+"Unable to delete snapshot: %(snap_id)s, due to invalid status. Status "
+"must be available or error, not %(snap_status)s."
+msgstr ""
+
+#: cinder/volume/api.py:792
+#, python-format
+msgid "Unable to delete snapshot: %s, because it is part of a consistency group."
+msgstr ""
+
+#: cinder/volume/api.py:1272
 msgid "Unable to find service for given host."
 msgstr ""
 
@@ -454,136 +467,148 @@ msgstr ""
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: cinder/volume/driver.py:277 cinder/volume/manager.py:780
+#: cinder/volume/driver.py:277 cinder/volume/manager.py:784
 #, python-format
 msgid "Error detaching volume %(volume)s, due to remove export failure."
 msgstr ""
 
-#: cinder/volume/driver.py:486 cinder/volume/manager.py:913
+#: cinder/volume/driver.py:486 cinder/volume/manager.py:919
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with driver provided model "
 "%(model)s"
 msgstr ""
 
-#: cinder/volume/driver.py:917 cinder/volume/targets/iscsi.py:144
+#: cinder/volume/driver.py:932 cinder/volume/targets/iscsi.py:144
 #, python-format
 msgid "ISCSI discovery attempt failed for:%s"
 msgstr ""
 
-#: cinder/volume/manager.py:218
+#: cinder/volume/driver.py:1084
+#, python-format
+msgid "The volume driver requires %(data)s in the connector."
+msgstr ""
+
+#: cinder/volume/driver.py:1367
+#, python-format
+msgid ""
+"FibreChannelDriver validate_connector failed. No '%(setting)s'. Make sure"
+" HBA state is Online."
+msgstr ""
+
+#: cinder/volume/manager.py:222
 #, python-format
 msgid "Failed to fetch pool name for volume: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:278
+#: cinder/volume/manager.py:282
 #, python-format
 msgid "Error encountered during initialization of driver: %(name)s"
 msgstr ""
 
-#: cinder/volume/manager.py:303
+#: cinder/volume/manager.py:307
 #, python-format
 msgid "Failed to re-export volume %s: setting to error state"
 msgstr ""
 
-#: cinder/volume/manager.py:319
+#: cinder/volume/manager.py:323
 #, python-format
 msgid ""
 "Error encountered during re-exporting phase of driver initialization:  "
 "%(name)s"
 msgstr ""
 
-#: cinder/volume/manager.py:376
+#: cinder/volume/manager.py:380
 msgid "Failed to create manager volume flow"
 msgstr ""
 
-#: cinder/volume/manager.py:470
+#: cinder/volume/manager.py:474
 #, python-format
 msgid "Cannot delete volume %s: volume is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:497
+#: cinder/volume/manager.py:501
 msgid "Failed to update usages deleting volume"
 msgstr ""
 
-#: cinder/volume/manager.py:568 cinder/volume/manager.py:1869
+#: cinder/volume/manager.py:572 cinder/volume/manager.py:1875
 #, python-format
 msgid ""
 "Failed updating %(snapshot_id)s metadata using the provided volumes "
 "%(volume_id)s metadata"
 msgstr ""
 
-#: cinder/volume/manager.py:613
+#: cinder/volume/manager.py:617
 #, python-format
 msgid "Cannot delete snapshot %s: snapshot is busy"
 msgstr ""
 
-#: cinder/volume/manager.py:643 cinder/volume/manager.py:1969
+#: cinder/volume/manager.py:647 cinder/volume/manager.py:1975
 msgid "Failed to update usages deleting snapshot"
 msgstr ""
 
-#: cinder/volume/manager.py:776
+#: cinder/volume/manager.py:780
 #, python-format
 msgid "Error detaching volume %(volume)s, due to uninitialized driver."
 msgstr ""
 
-#: cinder/volume/manager.py:812
+#: cinder/volume/manager.py:816
 #, python-format
 msgid "Error occurred while uploading volume %(volume_id)s to image %(image_id)s."
 msgstr ""
 
-#: cinder/volume/manager.py:1001
+#: cinder/volume/manager.py:1007
 #, python-format
 msgid ""
 "Failed updating model of volume %(volume_id)s with drivers update "
 "%(model)s during xfr."
 msgstr ""
 
-#: cinder/volume/manager.py:1342
+#: cinder/volume/manager.py:1348
 #, python-format
 msgid "volume %s: Error trying to extend volume"
 msgstr ""
 
-#: cinder/volume/manager.py:1420
+#: cinder/volume/manager.py:1426
 msgid "Failed to update usages while retyping volume."
 msgstr ""
 
-#: cinder/volume/manager.py:1456
+#: cinder/volume/manager.py:1462
 #, python-format
 msgid ""
 "Volume %s: driver error when trying to retype, falling back to generic "
 "mechanism."
 msgstr ""
 
-#: cinder/volume/manager.py:1523
+#: cinder/volume/manager.py:1529
 msgid "Failed to create manage_existing flow."
 msgstr ""
 
-#: cinder/volume/manager.py:1555
+#: cinder/volume/manager.py:1561
 #, python-format
 msgid "Failed to promote replica for volume %(id)s."
 msgstr ""
 
-#: cinder/volume/manager.py:1587
+#: cinder/volume/manager.py:1593
 #, python-format
 msgid "Failed to sync replica for volume %(id)s."
 msgstr ""
 
-#: cinder/volume/manager.py:1640
+#: cinder/volume/manager.py:1646
 #, python-format
 msgid "Error checking replication status for volume %s"
 msgstr ""
 
-#: cinder/volume/manager.py:1672
+#: cinder/volume/manager.py:1678
 #, python-format
 msgid "Consistency group %s: create failed"
 msgstr ""
 
-#: cinder/volume/manager.py:1764
+#: cinder/volume/manager.py:1770
 msgid "Failed to update usages deleting consistency groups."
 msgstr ""
 
-#: cinder/volume/manager.py:1781
+#: cinder/volume/manager.py:1787
 msgid "Failed to update usages deleting volume."
 msgstr ""
 
@@ -606,129 +631,72 @@ msgstr ""
 msgid "Failed to get updated stats from Datera Cluster."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:225
+#: cinder/volume/drivers/eqlx.py:236
 #, python-format
 msgid "Error running SSH command: \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:343
+#: cinder/volume/drivers/eqlx.py:354
 msgid "Failed to setup the Dell EqualLogic driver."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:360
+#: cinder/volume/drivers/eqlx.py:371
 #, python-format
 msgid "Failed to create volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:370
+#: cinder/volume/drivers/eqlx.py:381
 #, python-format
 msgid "Failed to add multihost-access for volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:385
+#: cinder/volume/drivers/eqlx.py:396
 #, python-format
 msgid "Failed to delete volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:401
+#: cinder/volume/drivers/eqlx.py:412
 #, python-format
 msgid "Failed to create snapshot of volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:415
+#: cinder/volume/drivers/eqlx.py:426
 #, python-format
 msgid "Failed to create volume from snapshot \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:428
+#: cinder/volume/drivers/eqlx.py:439
 #, python-format
 msgid "Failed to create clone of volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:438
+#: cinder/volume/drivers/eqlx.py:449
 #, python-format
 msgid "Failed to delete snapshot %(snap)s of volume %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:459
+#: cinder/volume/drivers/eqlx.py:470
 #, python-format
 msgid "Failed to initialize connection to volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:474
+#: cinder/volume/drivers/eqlx.py:485
 #, python-format
 msgid "Failed to terminate connection to volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:500
+#: cinder/volume/drivers/eqlx.py:511
 #, python-format
 msgid "Failed to ensure export of volume \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:519
+#: cinder/volume/drivers/eqlx.py:530
 #, python-format
 msgid ""
 "Failed to extend_volume %(name)s from %(current_size)sGB to "
 "%(new_size)sGB."
 msgstr ""
 
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:247
-#, python-format
-msgid ""
-"Error Create Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
-"%(error)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:519
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2094
-#, python-format
-msgid "Volume %(name)s not found on the array. No volume to delete."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:596
-#, python-format
-msgid "Cannot find Replication Service to create snapshot for volume %s."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:719
-#, python-format
-msgid ""
-"Snapshot: %(snapshot)s: volume: %(volume)s not found on the array. No "
-"snapshot to delete."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1419
-#, python-format
-msgid "_wait_for_job_complete failed after %(retries)d tries"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1428
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1492
-#: cinder/volume/drivers/emc/emc_vmax_common.py:946
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1004
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1405
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1712
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2165
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:513
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:655
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:210
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:850
-#: cinder/volume/drivers/emc/emc_vmax_provision.py:494
-#: cinder/volume/drivers/emc/emc_vmax_provision.py:505
-#: cinder/volume/drivers/emc/emc_vmax_provision.py:513
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:308
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:369
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:1260
-#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:220
-#, python-format
-msgid "Exception: %s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1483
-#, python-format
-msgid "_wait_for_sync failed after %(retries)d tries"
-msgstr ""
-
 #: cinder/volume/drivers/glusterfs.py:164
 #, python-format
 msgid "Exception during unmounting %s"
@@ -754,12 +722,12 @@ msgstr ""
 msgid "Size for volume: %s not found, cannot secure delete."
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:305
+#: cinder/volume/drivers/lvm.py:311
 #, python-format
 msgid "Unabled to delete due to existing snapshot for volume: %s"
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:506
+#: cinder/volume/drivers/lvm.py:516
 #, python-format
 msgid "Destination Volume Group %s does not exist"
 msgstr ""
@@ -780,17 +748,17 @@ msgstr ""
 msgid "Re-throwing Exception %s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:217
+#: cinder/volume/drivers/pure.py:230
 #, python-format
 msgid "Snapshot deletion failed with message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:331
+#: cinder/volume/drivers/pure.py:345
 #, python-format
 msgid "Unable to find host object in Purity with IQN: %(iqn)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:344
+#: cinder/volume/drivers/pure.py:358
 #, python-format
 msgid "Disconnection failed with message: %(msg)s."
 msgstr ""
@@ -809,19 +777,19 @@ msgstr ""
 msgid "error connecting to ceph cluster."
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:372 cinder/volume/drivers/sheepdog.py:170
+#: cinder/volume/drivers/rbd.py:372 cinder/volume/drivers/sheepdog.py:171
 msgid "error refreshing volume stats"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:714
+#: cinder/volume/drivers/rbd.py:721
 msgid "Retype with host migration not supported"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:718
+#: cinder/volume/drivers/rbd.py:725
 msgid "Retype of encryption type not supported"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:722
+#: cinder/volume/drivers/rbd.py:729
 msgid "Retype of extra_specs not supported"
 msgstr ""
 
@@ -843,72 +811,77 @@ msgstr ""
 msgid "Call to Nova delete snapshot failed"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:298
+#: 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:470
+#: cinder/volume/drivers/solidfire.py:493
 #, python-format
 msgid "Volume %s, not found on SF Cluster."
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:473
+#: cinder/volume/drivers/solidfire.py:496
 #, python-format
 msgid "Found %(count)s volumes mapped to id: %(uuid)s."
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:555
+#: cinder/volume/drivers/solidfire.py:556
+#, python-format
+msgid "Failed image conversion during cache creation: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:732
 #, python-format
 msgid ""
 "Account for Volume ID %s was not found on the SolidFire Cluster while "
 "attempting delete_volume operation!"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:558
+#: cinder/volume/drivers/solidfire.py:735
 msgid "This usually means the volume was never successfully created."
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:574
+#: cinder/volume/drivers/solidfire.py:751
 #, python-format
 msgid ""
 "Volume ID %s was not found on the SolidFire Cluster while attempting "
 "delete_volume operation!"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:649
+#: cinder/volume/drivers/solidfire.py:826
 #, python-format
 msgid ""
 "Volume ID %s was not found on the SolidFire Cluster while attempting "
 "extend_volume operation!"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:677
+#: cinder/volume/drivers/solidfire.py:854
 msgid "Failed to get updated stats"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:714
+#: cinder/volume/drivers/solidfire.py:891
 #, python-format
 msgid ""
 "Volume ID %s was not found on the SolidFire Cluster while attempting "
 "attach_volume operation!"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:740
+#: cinder/volume/drivers/solidfire.py:917
 #, python-format
 msgid ""
 "Volume ID %s was not found on the SolidFire Cluster while attempting "
 "detach_volume operation!"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:765
+#: cinder/volume/drivers/solidfire.py:942
 #, python-format
 msgid ""
 "Volume ID %s was not found on the SolidFire Cluster while attempting "
 "accept_transfer operation!"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:911
+#: cinder/volume/drivers/solidfire.py:1088
 #, python-format
 msgid ""
 "Account for Volume ID %s was not found on the SolidFire Cluster while "
@@ -1168,136 +1141,136 @@ msgstr ""
 msgid "Invalid return blob: %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:185
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:186
 #, python-format
 msgid "Error invalid json: %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:194
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:195
 #, python-format
 msgid "Invalid API object: %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:203
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:204
 #, python-format
 msgid "Login error: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:227
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:228
 #, python-format
 msgid "Failed to find %(s)s.  Result %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:286
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:287
 #, python-format
 msgid "Unable to create folder path %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:377
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:378
 #, python-format
 msgid "Unable to create folder %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:393
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:394
 #, python-format
 msgid "ScVolume create error %(name)s: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:472
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:473
 #, python-format
 msgid "AddHba error: %(i)s to %(s)s : %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:556
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:557
 #, python-format
 msgid "ScPhysicalServer create error: %(i)s: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:569
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:570
 msgid "Error adding HBA to server"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:605
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:606
 #, python-format
 msgid "ScServer error: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:633
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:634
 msgid "Error getting FaultDomainList"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:655
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:656
 msgid "Unable to find FC intitiators"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:682
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:683
 #, python-format
 msgid "Unable to find volume mappings: %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:685
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:686
 msgid "_find_mappings: volume is not active"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:702
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:703
 #, python-format
 msgid "Unable to find controller port: %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:743
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:744
 msgid "Find_wwns: Volume appears unmapped"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:777
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:778
 msgid "Find_iqn: Volume appears unmapped"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:809
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:810
 #, python-format
 msgid "Unable to map %(vol)s to %(srv)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:838
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:839
 #, python-format
 msgid "Unable to unmap Volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:894
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:895
 msgid "Error creating replay."
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:925
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:926
 #, python-format
 msgid "Invalid ReplayList return: %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:990
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:992
 #, python-format
 msgid "Unable to create volume %s from replay"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:1010
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:1012
 msgid "Error: unable to snap replay"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:1023
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:1025
 #, python-format
 msgid "Error expanding volume %(n)s: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:109
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:183
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:211
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:110
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:193
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:223
 #, python-format
 msgid "Failed to create volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:127
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:129
 #, python-format
 msgid "Failed to delete volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:263
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:279
 #, python-format
 msgid "Failed to ensure export of volume %s"
 msgstr ""
@@ -1345,57 +1318,85 @@ msgid ""
 "%(emcConfigFileName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:647
+#: cinder/volume/drivers/emc/emc_vmax_common.py:649
 #, python-format
 msgid "Volume %(name)s not found on the array. No volume to migrate using retype."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:659
+#: cinder/volume/drivers/emc/emc_vmax_common.py:661
 #, python-format
 msgid ""
 "Volume %(name)s is not suitable for storage assisted migration using "
 "retype"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1045
+#: cinder/volume/drivers/emc/emc_vmax_common.py:948
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1006
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1382
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1695
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2148
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:520
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:662
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:210
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:884
+#: cinder/volume/drivers/emc/emc_vmax_provision.py:494
+#: cinder/volume/drivers/emc/emc_vmax_provision.py:505
+#: cinder/volume/drivers/emc/emc_vmax_provision.py:513
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:308
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:369
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:1269
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1428
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1492
+#: cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py:220
+#, python-format
+msgid "Exception: %s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1047
 #, python-format
 msgid ""
 "Failed to add %(volumeName)s to default storage group for fast policy "
 "%(fastPolicyName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1070
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1072
 msgid "Error getting target pool name and array"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1082
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1084
 msgid "Error parsing target pool name, array, and fast policy"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1086
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1088
 #, python-format
 msgid ""
 "The source array : %(sourceArraySerialNumber)s does not match the target "
 "array: %(targetArraySerialNumber)sskipping storage-assisted migration"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1102
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1104
 #, python-format
 msgid ""
 "No action required. Volume : %(volumeName)s is already part of pool : "
 "%(pool)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1112
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1114
 msgid "Only available volumes can be migrated between different protocols"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1424
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1401
 #, python-format
 msgid "Target end points do not exist for hardware Id : %(hardwareIdInstance)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2156
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2077
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:519
+#, python-format
+msgid "Volume %(name)s not found on the array. No volume to delete."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2139
 #, python-format
 msgid ""
 "Failed to Roll back to re-add volume %(volumeName)s to default storage "
@@ -1403,51 +1404,56 @@ msgid ""
 " get the volume returned to the default storage group"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:493
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:500
 #, python-format
 msgid "Cannot find the fast policy %(fastPolicyName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:514
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:521
 #, python-format
 msgid ""
 "Failed to add storage group %(storageGroupInstanceName)s  to tier policy "
 "rule %(tierPolicyRuleInstanceName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:580
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:587
 #, python-format
 msgid "Error disassociating storage group from policy: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:323
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:293
+#, python-format
+msgid "Looks like masking view: %(maskingViewName)s has recently been deleted."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:334
 #, python-format
 msgid "Cannot get storage Group from job : %(storageGroupName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:340
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:351
 #, python-format
 msgid ""
 "Cannot add and verify tier policy association for storage group : "
 "%(storageGroupName)s to FAST policy : %(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:370
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:385
 #, python-format
 msgid ""
 "Could not find port group : %(portGroupName)s. Check that the EMC "
 "configuration file has the correct port group name. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:414
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:946
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:429
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:976
 #, python-format
 msgid ""
 "Initiator Name(s) %(initiatorNames)s are not on array "
 "%(storageSystemName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:979
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1009
 #, python-format
 msgid ""
 "One of the components of the original masking view %(maskingViewName)s "
@@ -1526,39 +1532,83 @@ msgstr ""
 msgid "Can't find volume to map %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/hds.py:106 cinder/volume/drivers/hds/iscsi.py:84
-#: cinder/volume/drivers/hds/nfs.py:73
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:247
+#, python-format
+msgid ""
+"Error Create Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
+"%(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:596
+#, python-format
+msgid "Cannot find Replication Service to create snapshot for volume %s."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:719
+#, python-format
+msgid ""
+"Snapshot: %(snapshot)s: volume: %(volume)s not found on the array. No "
+"snapshot to delete."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1419
+#, python-format
+msgid "_wait_for_job_complete failed after %(retries)d tries"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1483
+#, python-format
+msgid "_wait_for_sync failed after %(retries)d tries"
+msgstr ""
+
+#: cinder/volume/drivers/hds/hds.py:106 cinder/volume/drivers/hds/iscsi.py:82
+#: cinder/volume/drivers/hds/nfs.py:71
 #, python-format
 msgid "XML exception reading parameter: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/hds.py:200 cinder/volume/drivers/hds/iscsi.py:272
-#: cinder/volume/drivers/hds/nfs.py:196
+#: cinder/volume/drivers/hds/hds.py:200 cinder/volume/drivers/hds/iscsi.py:268
+#: cinder/volume/drivers/hds/nfs.py:195
 #, python-format
 msgid "No configuration found for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/hds.py:253 cinder/volume/drivers/hds/iscsi.py:350
+#: cinder/volume/drivers/hds/hds.py:253 cinder/volume/drivers/hds/iscsi.py:346
 #, python-format
 msgid "HDP not found: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/hds.py:292 cinder/volume/drivers/hds/iscsi.py:397
+#: cinder/volume/drivers/hds/hds.py:292 cinder/volume/drivers/hds/iscsi.py:393
 #, python-format
 msgid "iSCSI portal not found for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:683
+#: cinder/volume/drivers/hds/iscsi.py:92 cinder/volume/drivers/hds/nfs.py:84
+#, python-format
+msgid "Can't open config file: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:98 cinder/volume/drivers/hds/nfs.py:90
+#, python-format
+msgid "Error parsing config file: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:244
+msgid "CHAP authentication disabled"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:505
+msgid "delete_vol: provider location empty."
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:676
 #, python-format
 msgid "Array mismatch %(myid)s vs %(arid)s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/nfs.py:86
-msgid "Can't open config file: "
-msgstr ""
-
-#: cinder/volume/drivers/hds/nfs.py:93
-msgid "Error parsing config file: "
+#: cinder/volume/drivers/hds/nfs.py:467
+#, python-format
+msgid "NFS share %(share)s has no service entry: %(svc)s -> %(hdp)s"
 msgstr ""
 
 #: cinder/volume/drivers/hitachi/hbsd_common.py:721
@@ -1599,6 +1649,10 @@ msgstr ""
 msgid "Unexpected error occurs in snm2."
 msgstr ""
 
+#: cinder/volume/drivers/huawei/huawei_t.py:438
+msgid "validate_connector: The FC driver requires the wwpns in the connector."
+msgstr ""
+
 #: cinder/volume/drivers/huawei/huawei_utils.py:41
 #, python-format
 msgid "parse_xml_file: %s"
@@ -1623,8 +1677,8 @@ msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:689
 msgid ""
-"Error occured when adding hostgroup and lungroup to view. Remove lun from"
-" lungroup now."
+"Error occurred when adding hostgroup and lungroup to view. Remove lun "
+"from lungroup now."
 msgstr ""
 
 #: cinder/volume/drivers/huawei/rest_common.py:924
@@ -1756,6 +1810,10 @@ msgid ""
 "%(host_name)s found."
 msgstr ""
 
+#: cinder/volume/drivers/ibm/flashsystem.py:1141
+msgid "The connector does not contain the required information: wwpns is missing"
+msgstr ""
+
 #: cinder/volume/drivers/ibm/flashsystem.py:1216
 #, python-format
 msgid ""
@@ -1798,12 +1856,12 @@ msgstr ""
 msgid "Failed to issue mmlsattr command for path %(path)s, error: %(error)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/gpfs.py:801
+#: cinder/volume/drivers/ibm/gpfs.py:803
 #, python-format
 msgid "Failed to resize volume %(volume_id)s, error: %(error)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/gpfs.py:875
+#: cinder/volume/drivers/ibm/gpfs.py:877
 #, python-format
 msgid ""
 "Driver-based migration of volume %(vol)s failed. Move from %(src)s to "
@@ -1815,19 +1873,23 @@ msgstr ""
 msgid "ensure_export: Volume %s not found on storage"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:386
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:311
+msgid "The connector does not contain the required information."
+msgstr ""
+
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:387
 #, python-format
 msgid "Did not find expected column name in lsvdisk: %s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:485
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:486
 #, python-format
 msgid ""
 "initialize_connection: Failed to collect return properties for volume "
 "%(vol)s and connector %(conn)s.\n"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1031
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1032
 msgid "Could not get pool data from the storage"
 msgstr ""
 
@@ -2051,48 +2113,48 @@ msgstr ""
 msgid "Error running SSH command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:499
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:510
 #, python-format
 msgid "Error extending volume: %(vol)s. Exception: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:872
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:883
 #, python-format
 msgid "Error creating QOS rule %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1320
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1332
 #, python-format
 msgid "Error extending volume %(id)s. Ex: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1432
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1448
 #, python-format
 msgid "Error attaching volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1440
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1456
 #, python-format
 msgid "Error detaching volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2004
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2024
 #, python-format
 msgid "Exception during snapCPG revert: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2072
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2092
 #, python-format
 msgid "Unexpected error when retype() tried to deleteVolumeSet(%s)"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2093
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2096
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2113
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2116
 #, python-format
 msgid "Unexpected error when retype() revert tried to deleteVolumeSet(%s)"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2104
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2124
 #, python-format
 msgid ""
 "%(exception)s: Exception during revert of retype for volume "
@@ -2100,7 +2162,7 @@ msgid ""
 " restored."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:2115
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2135
 #, python-format
 msgid ""
 "%(exception)s: Exception during revert of retype for volume "
@@ -2113,16 +2175,23 @@ msgid "Volume %s doesn't exist on array."
 msgstr ""
 
 #: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:317
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:188
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:207
 msgid "Volume did not exist. It will not be deleted"
 msgstr ""
 
 #: cinder/volume/drivers/san/hp/hp_lefthand_cliq_proxy.py:329
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:221
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:249
 msgid "Snapshot did not exist. It will not be deleted"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:360
+#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:91
+#, python-format
+msgid ""
+"Invalid hplefthandclient version found (%(found)s). Version %(minimum)s "
+"or greater required."
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:417
 #, python-format
 msgid "'%(value)s' is an invalid value for extra spec '%(key)s'"
 msgstr ""
@@ -2313,7 +2382,7 @@ msgstr ""
 msgid "Error occurred during image transfer."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1204
+#: cinder/volume/drivers/vmware/volumeops.py:1206
 #, python-format
 msgid "Virtual disk device of backing: %s not found."
 msgstr ""
@@ -2363,7 +2432,7 @@ msgstr ""
 msgid "Exception during mounting %s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:633
+#: cinder/volume/drivers/zfssa/zfssarest.py:635
 msgid "Error getting initiator groups."
 msgstr ""
 
@@ -2375,7 +2444,7 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/flows/common.py:93
-#: cinder/volume/flows/manager/create_volume.py:696
+#: cinder/volume/flows/manager/create_volume.py:699
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(update)s"
 msgstr ""
@@ -2447,17 +2516,17 @@ msgstr ""
 msgid "Failed to copy image to volume: %(volume_id)s, error: %(error)s"
 msgstr ""
 
-#: cinder/volume/flows/manager/create_volume.py:587
+#: cinder/volume/flows/manager/create_volume.py:590
 #, python-format
 msgid "Failed updating volume %(volume_id)s with %(updates)s"
 msgstr ""
 
-#: cinder/volume/flows/manager/create_volume.py:611
+#: cinder/volume/flows/manager/create_volume.py:614
 #, python-format
 msgid "Unable to create volume. Volume driver %s not initialized"
 msgstr ""
 
-#: cinder/volume/flows/manager/create_volume.py:653
+#: cinder/volume/flows/manager/create_volume.py:656
 #: cinder/volume/flows/manager/manage_existing.py:85
 #, python-format
 msgid ""
@@ -2470,31 +2539,35 @@ msgstr ""
 msgid "Unable to manage existing volume. Volume driver %s not initialized."
 msgstr ""
 
-#: cinder/volume/targets/lio.py:76
+#: cinder/volume/targets/iscsi.py:187
+msgid "The volume driver requires the iSCSI initiator name in the connector."
+msgstr ""
+
+#: cinder/volume/targets/lio.py:79
 msgid "cinder-rtstool is not installed correctly"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:112 cinder/volume/targets/lio.py:121
+#: cinder/volume/targets/lio.py:115 cinder/volume/targets/lio.py:124
 #, python-format
 msgid "Failed to create iscsi target for volume id:%s."
 msgstr ""
 
-#: cinder/volume/targets/lio.py:114 cinder/volume/targets/lio.py:140
+#: cinder/volume/targets/lio.py:117 cinder/volume/targets/lio.py:143
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:138
+#: cinder/volume/targets/lio.py:141
 #, python-format
 msgid "Failed to remove iscsi target for volume id:%s."
 msgstr ""
 
-#: cinder/volume/targets/lio.py:167
+#: cinder/volume/targets/lio.py:170
 #, python-format
 msgid "Failed to add initiator iqn %s to target"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:193
+#: cinder/volume/targets/lio.py:196
 #, python-format
 msgid "Failed to delete initiator iqn %s to target."
 msgstr ""
@@ -2506,19 +2579,19 @@ msgid ""
 "id:%(vol_id)s: %(e)s"
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:251
+#: cinder/volume/targets/tgt.py:238
 #, python-format
 msgid "Failed to create iscsi target for volume id:%(vol_id)s: %(e)s"
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:275
+#: cinder/volume/targets/tgt.py:262
 #, 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/volume/targets/tgt.py:385 cinder/volume/targets/tgt.py:408
+#: cinder/volume/targets/tgt.py:379 cinder/volume/targets/tgt.py:402
 #, python-format
 msgid "Failed to remove iscsi target for volume id:%(vol_id)s: %(e)s"
 msgstr ""
diff --git a/cinder/locale/cinder-log-info.pot b/cinder/locale/cinder-log-info.pot
index 2e5522682bb..f1de69a05f9 100644
--- a/cinder/locale/cinder-log-info.pot
+++ b/cinder/locale/cinder-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2015.1.dev158\n"
+"Project-Id-Version: cinder 2015.1.dev303\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-01-15 06:08+0000\n"
+"POT-Creation-Date: 2015-01-30 06:25+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"
@@ -327,7 +327,7 @@ msgstr ""
 msgid "volume_file does not support fileno() so skippingfsync()"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:265
+#: cinder/brick/local_dev/lvm.py:267
 #, python-format
 msgid "'Not found' when querying LVM info. (vg_name=%(vg)s, lv_name=%(lv)s"
 msgstr ""
@@ -362,13 +362,6 @@ msgstr ""
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr ""
 
-#: cinder/openstack/common/request_utils.py:79
-#, python-format
-msgid ""
-"Request ID Link: %(event_name)s "
-"'%(source_id)s'%(arrow)s%(target_name)s%(target_id)s"
-msgstr ""
-
 #: cinder/openstack/common/service.py:174
 #, python-format
 msgid "Caught %s, exiting"
@@ -421,7 +414,7 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: cinder/scheduler/host_manager.py:466
+#: cinder/scheduler/host_manager.py:480
 #, python-format
 msgid "Removing non-active host: %(host)s from scheduler cache."
 msgstr ""
@@ -461,133 +454,172 @@ msgstr ""
 msgid "Volume %s has been transferred."
 msgstr ""
 
-#: cinder/volume/manager.py:261
+#: cinder/volume/api.py:285
+#, python-format
+msgid "Unable to delete volume: %s, volume is attached."
+msgstr ""
+
+#: cinder/volume/api.py:294
+#, python-format
+msgid ""
+"Unable to delete volume: %(vol_id)s, volume must be available or error, "
+"but is %(vol_status)s."
+msgstr ""
+
+#: cinder/volume/api.py:303
+#, python-format
+msgid "Unable to delete volume: %s, volume is currently migrating."
+msgstr ""
+
+#: cinder/volume/api.py:310
+#, python-format
+msgid ""
+"Unable to delete volume: %s, volume is currently part of a consistency "
+"group."
+msgstr ""
+
+#: cinder/volume/api.py:317
+#, python-format
+msgid "Unable to delete volume: %s, volume currently has snapshots."
+msgstr ""
+
+#: cinder/volume/api.py:334
+#, python-format
+msgid "Succesfully issued request to delete volume: %s"
+msgstr ""
+
+#: cinder/volume/api.py:803
+#, python-format
+msgid "Succesfully issued request to delete snapshot: %s"
+msgstr ""
+
+#: cinder/volume/manager.py:265
 msgid "Determined volume DB was empty at startup."
 msgstr ""
 
-#: cinder/volume/manager.py:264
+#: cinder/volume/manager.py:268
 msgid "Determined volume DB was not empty at startup."
 msgstr ""
 
-#: cinder/volume/manager.py:271
+#: cinder/volume/manager.py:275
 #, python-format
 msgid "Starting volume driver %(driver_name)s (%(version)s)"
 msgstr ""
 
-#: cinder/volume/manager.py:310
+#: cinder/volume/manager.py:314
 #, python-format
 msgid "volume %s stuck in a downloading state"
 msgstr ""
 
-#: cinder/volume/manager.py:317
+#: cinder/volume/manager.py:321
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: cinder/volume/manager.py:332
+#: cinder/volume/manager.py:336
 #, python-format
 msgid "Resuming delete on volume: %s"
 msgstr ""
 
-#: cinder/volume/manager.py:438
+#: cinder/volume/manager.py:442
 #, python-format
 msgid "Tried to delete volume %s, but it no longer exists, moving on"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:503
+#: cinder/volume/manager.py:507
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:533
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:583
+#: cinder/volume/manager.py:587
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:595
+#: cinder/volume/manager.py:599
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:650
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1226
+#: cinder/volume/manager.py:1232
 msgid "Updating volume status"
 msgstr ""
 
-#: cinder/volume/manager.py:1270
+#: cinder/volume/manager.py:1276
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
 
-#: cinder/volume/manager.py:1338
+#: cinder/volume/manager.py:1344
 #, python-format
 msgid "volume %s: extending"
 msgstr ""
 
-#: cinder/volume/manager.py:1340
+#: cinder/volume/manager.py:1346
 #, python-format
 msgid "volume %s: extended successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1453
+#: cinder/volume/manager.py:1459
 #, python-format
 msgid "Volume %s: retyped successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1614
+#: cinder/volume/manager.py:1620
 msgid "Updating volume replication status."
 msgstr ""
 
-#: cinder/volume/manager.py:1658
+#: cinder/volume/manager.py:1664
 #, python-format
 msgid "Consistency group %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:1680
+#: cinder/volume/manager.py:1686
 #, python-format
 msgid "Consistency group %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1699
+#: cinder/volume/manager.py:1705
 #, python-format
 msgid "Consistency group %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1799
+#: cinder/volume/manager.py:1805
 #, python-format
 msgid "Consistency group %s: deleted successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:1812
+#: cinder/volume/manager.py:1818
 #, python-format
 msgid "Cgsnapshot %s: creating."
 msgstr ""
 
-#: cinder/volume/manager.py:1887
+#: cinder/volume/manager.py:1893
 #, python-format
 msgid "cgsnapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1900
+#: cinder/volume/manager.py:1906
 #, python-format
 msgid "cgsnapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1980
+#: cinder/volume/manager.py:1986
 #, python-format
 msgid "cgsnapshot %s: deleted successfully"
 msgstr ""
@@ -602,114 +634,22 @@ msgstr ""
 msgid "Elapsed time for clear volume: %.2f sec"
 msgstr ""
 
-#: cinder/volume/drivers/block_device.py:106 cinder/volume/drivers/lvm.py:360
+#: cinder/volume/drivers/block_device.py:106 cinder/volume/drivers/lvm.py:368
 #: cinder/volume/drivers/srb.py:715 cinder/volume/drivers/nexenta/nfs.py:192
 #, python-format
 msgid "Creating clone of volume: %s"
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:209
+#: cinder/volume/drivers/eqlx.py:218
 #, python-format
 msgid "EQL-driver: executing \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:339
+#: cinder/volume/drivers/eqlx.py:350
 #, python-format
 msgid "EQL-driver: Setup is complete, group IP is \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:160
-#, python-format
-msgid "Create Volume: %(volume)s  Size: %(size)lu"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:290
-#, python-format
-msgid ""
-"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
-"%(snapshotname)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:399
-#, python-format
-msgid ""
-"Create a Clone from Volume: Volume: %(volumename)s  Source Volume: "
-"%(srcname)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:503
-#, python-format
-msgid "Delete Volume: %(volume)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:577
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863
-#, python-format
-msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:705
-#, python-format
-msgid "Delete Snapshot: %(snapshot)s: volume: %(volume)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:786
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:800
-#, python-format
-msgid "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot is deleted."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:934
-#, python-format
-msgid "Map volume: %(volume)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:953
-#: cinder/volume/drivers/emc/emc_vmax_common.py:223
-#, python-format
-msgid "Unmap volume: %(volume)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:959
-#: cinder/volume/drivers/emc/emc_vmax_common.py:229
-#, python-format
-msgid "Volume %s is not mapped. No volume to unmap."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:978
-#: cinder/volume/drivers/emc/emc_vmax_common.py:276
-#, python-format
-msgid "Initialize connection: %(volume)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:984
-#, python-format
-msgid "Volume %s is already mapped."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:996
-#: cinder/volume/drivers/emc/emc_vmax_common.py:383
-#, python-format
-msgid "Terminate connection: %(volume)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1013
-#, python-format
-msgid "Extend Volume: %(volume)s  New size: %(size)lu"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1356
-#, python-format
-msgid ""
-"Snapshot Volume %(snapshotname)s, Source Volume %(volumename)s not found "
-"on the array."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1672
-#, python-format
-msgid "Device number not found for volume %(volumename)s %(vol_instance)s."
-msgstr ""
-
 #: cinder/volume/drivers/glusterfs.py:173
 #, python-format
 msgid "%s is already umounted"
@@ -721,8 +661,18 @@ msgstr ""
 msgid "casted to %s"
 msgstr ""
 
+#: cinder/volume/drivers/lvm.py:316
+#, python-format
+msgid "Succesfully deleted volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:331
+#, python-format
+msgid "Succesfully deleted snapshot: %s"
+msgstr ""
+
 #: cinder/volume/drivers/nfs.py:281 cinder/volume/drivers/smbfs.py:407
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:617
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:615
 #, python-format
 msgid "Extending volume %s."
 msgstr ""
@@ -904,26 +854,31 @@ msgstr ""
 msgid "Deleting deleteInitiatorGrp %s "
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:270
+#: cinder/volume/drivers/pure.py:283
 #, python-format
 msgid "Using port %(name)s on the array at %(portal)s for iSCSI connectivity."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:284
+#: cinder/volume/drivers/pure.py:297
 #, python-format
 msgid "Re-using existing purity host %(host_name)r"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:289
+#: cinder/volume/drivers/pure.py:302
 #, python-format
 msgid "Creating host object %(host_name)r with IQN: %(iqn)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:349
+#: cinder/volume/drivers/pure.py:363
 #, python-format
 msgid "Deleting unneeded host %(host_name)r."
 msgstr ""
 
+#: cinder/volume/drivers/pure.py:550 cinder/volume/drivers/pure.py:578
+#, python-format
+msgid "Renaming existing volume %(ref_name)s to %(new_name)s"
+msgstr ""
+
 #: cinder/volume/drivers/quobyte.py:389
 #, python-format
 msgid "Fixing previous mount %s which was not unmounted correctly."
@@ -939,12 +894,12 @@ msgstr ""
 msgid "Mounting volume: %s succeeded"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:617
+#: cinder/volume/drivers/rbd.py:624
 #, python-format
 msgid "volume %s no longer exists in backend"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:663
+#: cinder/volume/drivers/rbd.py:670
 #, python-format
 msgid "RBD volume %s not found, allowing delete operation to proceed."
 msgstr ""
@@ -975,16 +930,23 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:288
+#: cinder/volume/drivers/scality.py:296
 #, python-format
 msgid "Begin backup of volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:307
+#: cinder/volume/drivers/scality.py:315
 #, python-format
 msgid "Restoring backup %(backup)s to volume %(volume)s."
 msgstr ""
 
+#: cinder/volume/drivers/solidfire.py:625
+#, python-format
+msgid ""
+"Unable to create cache volume because image: %s does not include "
+"properties.virtual_size"
+msgstr ""
+
 #: cinder/volume/drivers/srb.py:340
 msgid "Error creating Volume"
 msgstr ""
@@ -1097,7 +1059,7 @@ msgid ""
 "[%(cb_vol)s] and parent OpenStack volume [%(stack_vol)s]."
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:398
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:399
 #, python-format
 msgid "Created volume %(index)d: %(name)s"
 msgstr ""
@@ -1131,6 +1093,24 @@ msgstr ""
 msgid "Delete Snapshot: %(snapshotName)s "
 msgstr ""
 
+#: cinder/volume/drivers/emc/emc_vmax_common.py:223
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:953
+#, python-format
+msgid "Unmap volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:229
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:959
+#, python-format
+msgid "Volume %s is not mapped. No volume to unmap."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:276
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:978
+#, python-format
+msgid "Initialize connection: %(volume)s"
+msgstr ""
+
 #: cinder/volume/drivers/emc/emc_vmax_common.py:286
 #, python-format
 msgid ""
@@ -1138,7 +1118,13 @@ msgid ""
 "%(deviceNumber)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:577
+#: cinder/volume/drivers/emc/emc_vmax_common.py:383
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:996
+#, python-format
+msgid "Terminate connection: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:579
 #, python-format
 msgid ""
 "FAST: capacity stats for policy %(fastPolicyName)s on array %(arrayName)s"
@@ -1146,7 +1132,7 @@ msgid ""
 "free_capacity_gb=%(free_capacity_gb)lu"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:588
+#: cinder/volume/drivers/emc/emc_vmax_common.py:590
 #, python-format
 msgid ""
 "NON-FAST: capacity stats for pool %(poolName)s on array %(arrayName)s "
@@ -1154,49 +1140,49 @@ msgid ""
 "free_capacity_gb=%(free_capacity_gb)lu"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:639
+#: cinder/volume/drivers/emc/emc_vmax_common.py:641
 #, python-format
 msgid "Migrating using retype Volume: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:865
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2415
+#: cinder/volume/drivers/emc/emc_vmax_common.py:867
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2421
 #, python-format
 msgid ""
 "Adding volume: %(volumeName)s to default storage group for FAST policy: "
 "%(fastPolicyName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1109
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1111
 #, python-format
 msgid "Volume status is: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1137
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1139
 #, python-format
 msgid "configGroup of current host: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1868
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1851
 #, python-format
 msgid ""
 "Create a Clone from Volume: Clone Volume: %(cloneName)s Source Volume: "
 "%(sourceName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1947
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1930
 #, python-format
 msgid ""
 "Base target volume %(targetVol)s created. Capacity in bits: "
 "%(capInBits)lu "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2307
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2313
 #, python-format
 msgid "Target wwns in masking view %(maskingView)s: %(targetWwns)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:587
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:594
 #, python-format
 msgid "Storage group not associated with the policy %s"
 msgstr ""
@@ -1255,43 +1241,48 @@ msgstr ""
 msgid "AUTH properties: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:328
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:298
+#, python-format
+msgid "Found existing masking view: %(maskingViewName)s "
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:339
 #, python-format
 msgid "Created new storage group: %(storageGroupName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:425
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:440
 #, python-format
 msgid "Created new initiator group name: %(igGroupName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:428
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:443
 #, python-format
 msgid "Using existing initiator group name: %(igGroupName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:598
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:619
 #, python-format
 msgid "Created new masking view : %(maskingViewName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:729
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:763
 #, python-format
 msgid "Port group instance name is %(foundPortGroupInstanceName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1320
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1344
 #, python-format
 msgid ""
 "policy:%(policy)s, policy service:%(service)s, masking "
 "group=%(maskingGroup)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:672
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:677
 msgid "Fast Policy not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:1195
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:1204
 #, python-format
 msgid "Volume  %(volume)s does not have meta device members."
 msgstr ""
@@ -1344,6 +1335,12 @@ msgid ""
 "%(provisioning)s tiering: %(tiering)s."
 msgstr ""
 
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:577
+#, python-format
+msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
+msgstr ""
+
 #: cinder/volume/drivers/emc/emc_vnx_cli.py:1875
 #, python-format
 msgid "Delete Snapshot: %(snapshot)s"
@@ -1424,81 +1421,183 @@ msgstr ""
 msgid "initiator has no password while using chap,removing it"
 msgstr ""
 
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:160
+#, python-format
+msgid "Create Volume: %(volume)s  Size: %(size)lu"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:290
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:399
+#, python-format
+msgid ""
+"Create a Clone from Volume: Volume: %(volumename)s  Source Volume: "
+"%(srcname)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:503
+#, python-format
+msgid "Delete Volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:705
+#, python-format
+msgid "Delete Snapshot: %(snapshot)s: volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:786
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:800
+#, python-format
+msgid "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot is deleted."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:934
+#, python-format
+msgid "Map volume: %(volume)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:984
+#, python-format
+msgid "Volume %s is already mapped."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1013
+#, python-format
+msgid "Extend Volume: %(volume)s  New size: %(size)lu"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1356
+#, python-format
+msgid ""
+"Snapshot Volume %(snapshotname)s, Source Volume %(volumename)s not found "
+"on the array."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1672
+#, python-format
+msgid "Device number not found for volume %(volumename)s %(vol_instance)s."
+msgstr ""
+
 #: cinder/volume/drivers/hds/hds.py:95 cinder/volume/drivers/hds/iscsi.py:73
 #: cinder/volume/drivers/hds/nfs.py:62
 #, python-format
 msgid "%(element)s: %(val)s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/hds.py:108 cinder/volume/drivers/hds/iscsi.py:87
-#: cinder/volume/drivers/hds/nfs.py:75
+#: cinder/volume/drivers/hds/hds.py:108 cinder/volume/drivers/hds/iscsi.py:84
+#: cinder/volume/drivers/hds/nfs.py:73
 #, python-format
 msgid "XML exception reading parameter: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:148
+#: cinder/volume/drivers/hds/iscsi.py:57
+#, python-format
+msgid "Parse_loc: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:149
 #, python-format
 msgid "Backend type: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:206
+#: cinder/volume/drivers/hds/iscsi.py:203
 #, python-format
 msgid "Using default: instead of %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:207
-#: cinder/volume/drivers/hds/iscsi.py:270 cinder/volume/drivers/hds/nfs.py:194
+#: cinder/volume/drivers/hds/iscsi.py:204
+#: cinder/volume/drivers/hds/iscsi.py:266 cinder/volume/drivers/hds/nfs.py:193
 #, python-format
 msgid "Available services: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:219
+#: cinder/volume/drivers/hds/iscsi.py:216
 #, python-format
 msgid "Retrieving secret for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:253
+#: cinder/volume/drivers/hds/iscsi.py:235
+#, python-format
+msgid "Set tgt CHAP secret for service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:249
 #, python-format
 msgid "Retrieving target for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:312
+#: cinder/volume/drivers/hds/iscsi.py:293
+#, python-format
+msgid "stats: total: %(cap)d used: %(used)d"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:308
 #, python-format
 msgid "stats: stats: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:335
+#: cinder/volume/drivers/hds/iscsi.py:331
 #, python-format
 msgid "HDP list: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:386
+#: cinder/volume/drivers/hds/iscsi.py:382
 #, python-format
 msgid "do_setup: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:390
+#: cinder/volume/drivers/hds/iscsi.py:386
 #, python-format
 msgid "iSCSI portal found for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:444
+#: cinder/volume/drivers/hds/iscsi.py:439
 #, python-format
 msgid "create_volume: create_lu returns %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:450
+#: cinder/volume/drivers/hds/iscsi.py:445
 #, python-format
 msgid "LUN %(lun)s of size %(sz)s MB is created."
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:501
+#: cinder/volume/drivers/hds/iscsi.py:495
 #, python-format
 msgid "LUN %(lun)s extended to %(size)s GB."
 msgstr ""
 
+#: cinder/volume/drivers/hds/iscsi.py:510
+#, python-format
+msgid "delete lun loc %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:538
+#, python-format
+msgid "initialize volume %(vol)s connector %(conn)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:567
+#, python-format
+msgid "initiate: connection %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:598
+#, python-format
+msgid "terminate: connection %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:189
+#, python-format
+msgid "Get service: %(lbl)s->%(svc)s"
+msgstr ""
+
 #: cinder/volume/drivers/hds/nfs.py:220
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:488
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:486
 #, python-format
 msgid "Resizing file to %sG"
 msgstr ""
@@ -1508,6 +1607,33 @@ msgstr ""
 msgid "LUN %(id)s extended to %(size)s GB."
 msgstr ""
 
+#: cinder/volume/drivers/hds/nfs.py:442
+#, python-format
+msgid "Review shares: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:449
+#, python-format
+msgid "share: %(share)s -> %(info)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:461
+#, python-format
+msgid "Save service info for %(svc)s -> %(hdp)s, %(path)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:473
+#, python-format
+msgid "share: %s incorrect entry"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:485
+#, python-format
+msgid ""
+"Cloning with volume_name %(vname)s clone_name %(cname)s export_path "
+"%(epath)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/__init__.py:68
 #, python-format
 msgid ""
@@ -1716,17 +1842,17 @@ msgstr ""
 msgid "Tried to delete non-existant vdisk %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:75
+#: cinder/volume/drivers/netapp/common.py:76
 #, python-format
 msgid "OpenStack OS Version Info: %(info)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:92
+#: cinder/volume/drivers/netapp/common.py:93
 #, python-format
 msgid "Requested unified config: %(storage_family)s and %(storage_protocol)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:110
+#: cinder/volume/drivers/netapp/common.py:111
 #, python-format
 msgid ""
 "NetApp driver of family %(storage_family)s and protocol "
@@ -1798,27 +1924,27 @@ msgstr ""
 msgid "Cleaning cache for share %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:397
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:395
 #, python-format
 msgid "Image cloning unsuccessful for image %(image_id)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:413
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:411
 #, python-format
 msgid "Cloning image %s from cache"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:433
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:431
 #, python-format
 msgid "Checking image clone %s from glance share."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:455
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:453
 #, python-format
 msgid "Image will locally be converted to raw %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:473
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:471
 #, python-format
 msgid "Performing post clone for %s"
 msgstr ""
@@ -2066,132 +2192,139 @@ msgstr ""
 msgid "Activate Flexvisor cinder volume driver."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "Disconnect from 3PAR REST and SSH %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
 #, python-format
 msgid "logout Done %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:269
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:271
 #, python-format
 msgid "HP3PARCommon %(common_ver)s, hp3parclient %(rest_ver)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:374
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:377
+#, python-format
+msgid ""
+"Virtual volume %(disp)s '%(new)s' snapCPG is empty so it will be set to: "
+"%(cpg)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:385
 #, python-format
 msgid "Virtual volume '%(ref)s' renamed to '%(new)s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:380
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:391
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is being retyped."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:387
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:398
 #, python-format
 msgid "Virtual volume %(disp)s successfully retyped to %(new_type)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:406
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:417
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is now being managed."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:459
 #, python-format
 msgid ""
 "Virtual volume %(disp)s '%(vol)s' is no longer managed. Volume renamed to"
 " '%(new)s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1469
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1486
 #, python-format
 msgid "3PAR driver cannot perform migration. Retype exception: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1534
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1554
 #, python-format
 msgid "Completed: convert_to_base_volume: id=%s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1655
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1675
 #, python-format
 msgid "Modifying %(volume_name)s userCPG from %(old_cpg)s to %(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1676
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1696
 #, python-format
 msgid "Converting %(volume_name)s to full provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1681
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1701
 #, python-format
 msgid "Converting %(volume_name)s to thin provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1697
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1717
 #, python-format
 msgid "tunevv failed because the volume '%s' has snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1974
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1994
 #, python-format
 msgid ""
 "Modifying %(volume_name)s snap_cpg from %(old_snap_cpg)s to "
 "%(new_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1985
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2005
 #, python-format
 msgid "Modifying %s comments."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1994
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2014
 #, python-format
 msgid ""
 "Retype revert %(volume_name)s snap_cpg from %(new_snap_cpg)s back to "
 "%(old_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:80
+#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:79
 #, python-format
 msgid "HPLeftHand driver %(driver_ver)s, proxy %(proxy_ver)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:501
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:561
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because volume "
 "is from a different backend."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:506
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:512
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:566
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:572
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because cluster "
 "exists in different management group."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:523
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:586
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because the "
 "volume has been exported."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:534
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:597
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because the "
 "volume has snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:542
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:605
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because volume "
@@ -2218,12 +2351,12 @@ msgstr ""
 msgid "Successfully established connection to the server."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:209
+#: cinder/volume/drivers/vmware/read_write_util.py:202
 #, python-format
 msgid "Opening vmdk url: %s for write."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:302
+#: cinder/volume/drivers/vmware/read_write_util.py:295
 #, python-format
 msgid "Opening vmdk url: %s for read."
 msgstr ""
@@ -2358,7 +2491,7 @@ msgid "Relocating volume: %(backing)s to %(ds)s and %(rp)s."
 msgstr ""
 
 #: cinder/volume/drivers/vmware/vmdk.py:2006
-#: cinder/volume/drivers/vmware/volumeops.py:1066
+#: cinder/volume/drivers/vmware/volumeops.py:1068
 #, python-format
 msgid "Successfully created clone: %s."
 msgstr ""
@@ -2393,66 +2526,66 @@ msgstr ""
 msgid "Deleted the VM backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:571
+#: cinder/volume/drivers/vmware/volumeops.py:573
 #, python-format
 msgid "Successfully extended the volume %(name)s to %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:716
+#: cinder/volume/drivers/vmware/volumeops.py:718
 #, python-format
 msgid "Successfully created volume backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:874
+#: cinder/volume/drivers/vmware/volumeops.py:876
 #, 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:892
+#: cinder/volume/drivers/vmware/volumeops.py:894
 #, python-format
 msgid "Successfully moved volume backing: %(backing)s into the folder: %(fol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:916
+#: cinder/volume/drivers/vmware/volumeops.py:918
 #, python-format
 msgid "Successfully created snapshot: %(snap)s for volume backing: %(backing)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:978
+#: cinder/volume/drivers/vmware/volumeops.py:980
 #, 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:989
+#: cinder/volume/drivers/vmware/volumeops.py:991
 #, python-format
 msgid "Successfully deleted snapshot: %(name)s of backing: %(backing)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1116
+#: cinder/volume/drivers/vmware/volumeops.py:1118
 #, python-format
 msgid "Renaming backing VM: %(backing)s to %(new_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1125
+#: cinder/volume/drivers/vmware/volumeops.py:1127
 #, python-format
 msgid "Backing VM: %(backing)s renamed to %(new_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1170
+#: cinder/volume/drivers/vmware/volumeops.py:1172
 #, python-format
 msgid "Successfully deleted file: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1319
+#: cinder/volume/drivers/vmware/volumeops.py:1321
 #, python-format
 msgid "Successfully copied disk at: %(src)s to: %(dest)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1337
+#: cinder/volume/drivers/vmware/volumeops.py:1339
 #, python-format
 msgid "Deleted vmdk file: %s."
 msgstr ""
@@ -2502,41 +2635,41 @@ msgstr ""
 msgid "source volume for cloning: %s"
 msgstr ""
 
-#: cinder/volume/flows/manager/create_volume.py:619
+#: cinder/volume/flows/manager/create_volume.py:622
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created as %(create_type)s with "
 "specification: %(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:46 cinder/volume/targets/tgt.py:334
+#: cinder/volume/targets/lio.py:49 cinder/volume/targets/tgt.py:328
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:63
+#: cinder/volume/targets/lio.py:66
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provision for volume: %s"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:96
+#: cinder/volume/targets/lio.py:99
 #, python-format
 msgid "Creating iscsi_target for volume: %s"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:128
+#: cinder/volume/targets/lio.py:131
 #, python-format
 msgid "Removing iscsi_target: %s"
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:349
+#: cinder/volume/targets/tgt.py:343
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %s"
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:363
+#: cinder/volume/targets/tgt.py:357
 #, python-format
 msgid "Removing iscsi_target for: %s"
 msgstr ""
diff --git a/cinder/locale/cinder-log-warning.pot b/cinder/locale/cinder-log-warning.pot
index ba421884cf5..7fc6880a126 100644
--- a/cinder/locale/cinder-log-warning.pot
+++ b/cinder/locale/cinder-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2015.1.dev158\n"
+"Project-Id-Version: cinder 2015.1.dev303\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-01-15 06:09+0000\n"
+"POT-Creation-Date: 2015-01-30 06:25+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"
@@ -118,12 +118,12 @@ msgstr ""
 msgid "Couldn't find multipath device %(line)s"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:272
+#: cinder/brick/local_dev/lvm.py:274
 #, python-format
 msgid "Took %s seconds to get logical volume info."
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:369
+#: cinder/brick/local_dev/lvm.py:373
 #, python-format
 msgid "Took %s seconds to get volume groups."
 msgstr ""
@@ -137,7 +137,7 @@ msgstr ""
 msgid "Deadlock detected when running '%(func_name)s': Retrying..."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:893
+#: cinder/db/sqlalchemy/api.py:867
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %s"
 msgstr ""
@@ -179,7 +179,7 @@ msgstr ""
 msgid "No weighed hosts found for volume with properties: %s"
 msgstr ""
 
-#: cinder/scheduler/host_manager.py:447
+#: cinder/scheduler/host_manager.py:461
 #, python-format
 msgid "volume service is down. (host: %s)"
 msgstr ""
@@ -213,12 +213,12 @@ msgstr ""
 msgid "Error in filtering function '%(function)s' : '%(error)s' :: failing host"
 msgstr ""
 
-#: cinder/scheduler/filters/instance_locality_filter.py:97
+#: cinder/scheduler/filters/instance_locality_filter.py:96
 #, python-format
 msgid "Hint \"%s\" dropped because ExtendedServerAttributes not active in Nova."
 msgstr ""
 
-#: cinder/scheduler/filters/instance_locality_filter.py:108
+#: cinder/scheduler/filters/instance_locality_filter.py:107
 #, python-format
 msgid ""
 "Hint \"%s\" dropped because Nova did not return enough information. "
@@ -253,35 +253,35 @@ msgstr ""
 msgid "Share %(share)s and file name %(file_name)s"
 msgstr ""
 
-#: cinder/volume/driver.py:903
-#: cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py:150
+#: cinder/volume/driver.py:918
+#: cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py:150
 #: cinder/volume/targets/iscsi.py:131
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: cinder/volume/manager.py:179
+#: cinder/volume/manager.py:183
 #, python-format
 msgid "Driver path %s is deprecated, update your configuration to the new path."
 msgstr ""
 
-#: cinder/volume/manager.py:837
+#: cinder/volume/manager.py:841
 #, python-format
 msgid "Deleting image %(image_id)s in %(image_status)s state."
 msgstr ""
 
-#: cinder/volume/manager.py:843
+#: cinder/volume/manager.py:847
 #, python-format
 msgid "Error occurred while deleting image %s."
 msgstr ""
 
-#: cinder/volume/manager.py:1234
+#: cinder/volume/manager.py:1240
 #, python-format
 msgid ""
 "Unable to update stats, %(driver_name)s -%(driver_version)s "
 "%(config_group)s driver is uninitialized."
 msgstr ""
 
-#: cinder/volume/manager.py:1622
+#: cinder/volume/manager.py:1628
 #, python-format
 msgid ""
 "Unable to update volume replication status, %(driver_name)s "
@@ -312,30 +312,16 @@ msgstr ""
 msgid "got disconnected; trying to reconnect. (%s)"
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:381
+#: cinder/volume/drivers/eqlx.py:392
 #, python-format
 msgid "Volume %s was not found while trying to delete it."
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:496
+#: cinder/volume/drivers/eqlx.py:507
 #, python-format
 msgid "Volume %s is not found!, it may have been deleted."
 msgstr ""
 
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:792
-#, python-format
-msgid ""
-"Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but cleanup "
-"timed out."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:805
-#, python-format
-msgid ""
-"Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but error "
-"during cleanup. Error: %(error)s"
-msgstr ""
-
 #: cinder/volume/drivers/glusterfs.py:184
 #, python-format
 msgid "Failed to refresh mounts, reason=%s"
@@ -352,12 +338,12 @@ msgstr ""
 msgid "Unable to update stats on non-initialized Volume Group: %s"
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:322 cinder/volume/drivers/srb.py:752
+#: cinder/volume/drivers/lvm.py:329 cinder/volume/drivers/srb.py:752
 #, python-format
 msgid "snapshot: %s not found, skipping delete operations"
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:589 cinder/volume/drivers/lvm.py:606
+#: cinder/volume/drivers/lvm.py:599 cinder/volume/drivers/lvm.py:616
 msgid ""
 "LVMISCSIDriver is deprecated, you should now just use LVMVolumeDriver and"
 " specify target_helper for the target driver you wish to use."
@@ -379,33 +365,38 @@ msgid ""
 "Please see %s for information on a secure NAS configuration."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:195
+#: cinder/volume/drivers/pure.py:208
 #, python-format
 msgid "Volume deletion failed with message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:246
+#: cinder/volume/drivers/pure.py:259
 #, python-format
 msgid ""
 "iSCSI discovery of port %(port_name)s at %(port_portal)s failed with "
 "error: %(err_msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:301
+#: cinder/volume/drivers/pure.py:314
 #, python-format
 msgid "Volume connection already exists with message: %s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:420
+#: cinder/volume/drivers/pure.py:434
 #, python-format
 msgid "Unable to delete Protection Group: %s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:469
+#: cinder/volume/drivers/pure.py:485
 #, python-format
 msgid "Unable to delete Protection Group Snapshot: %s"
 msgstr ""
 
+#: cinder/volume/drivers/pure.py:587
+#, python-format
+msgid "Volume unmanage was unable to rename the volume, error message: %s"
+msgstr ""
+
 #: cinder/volume/drivers/quobyte.py:106
 #, python-format
 msgid ""
@@ -442,7 +433,7 @@ msgstr ""
 msgid "flush() not supported in this version of librbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:824
+#: cinder/volume/drivers/rbd.py:833
 msgid "volume_tmp_dir is now deprecated, please use image_conversion_dir"
 msgstr ""
 
@@ -460,12 +451,16 @@ msgstr ""
 msgid "qemu-img is not installed."
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:408
+#: cinder/volume/drivers/solidfire.py:431
 #: cinder/volume/drivers/fusionio/ioControl.py:254
 #, python-format
 msgid "More than one valid preset was detected, using %s"
 msgstr ""
 
+#: cinder/volume/drivers/solidfire.py:618
+msgid "Requested image is not accesible by current Tenant."
+msgstr ""
+
 #: cinder/volume/drivers/srb.py:83
 #, python-format
 msgid "Retrying failed call to %(func)s, attempt %(attempt)i."
@@ -544,31 +539,31 @@ msgstr ""
 msgid "snapshot: snapshot %s not found, skipping delete operation"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:213
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:214
 #, python-format
 msgid "Logout error: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:442
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:443
 #, python-format
 msgid "delete_volume: unable to find volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:498
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:499
 #, python-format
 msgid "ScServerOperatingSystem GetList return: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:741
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:742
 msgid "Inconsistent Luns."
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:153
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:157
 #, python-format
 msgid "Unable to locate volume:%s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:687
+#: cinder/volume/drivers/emc/emc_vmax_common.py:689
 msgid ""
 "The VMAX plugin only supports Retype.  If a pool based migration is "
 "necessary this will happen on a Retype From the command line: cinder "
@@ -576,31 +571,31 @@ msgid ""
 "policy on-demand"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:721
+#: cinder/volume/drivers/emc/emc_vmax_common.py:723
 #, python-format
 msgid ""
 "Failed to migrate: %(volumeName)s from default source storage group for "
 "FAST policy: %(sourceFastPolicyName)s Attempting cleanup... "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:747
+#: cinder/volume/drivers/emc/emc_vmax_common.py:749
 #, python-format
 msgid ""
 "Attempting a rollback of: %(volumeName)s to original pool "
 "%(sourcePoolInstanceName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:778
+#: cinder/volume/drivers/emc/emc_vmax_common.py:780
 #, python-format
 msgid "_migrate_rollback on : %(volumeName)s from "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:816
+#: cinder/volume/drivers/emc/emc_vmax_common.py:818
 #, python-format
 msgid "_migrate_cleanup on : %(volumeName)s from "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2188
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2171
 #, python-format
 msgid ""
 "Pre check for deletion Volume: %(volumeName)s is part of a storage group "
@@ -619,7 +614,7 @@ msgid "Unable to get storage tiers from tier policy rule."
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vmax_masking.py:187
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:695
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:729
 #, python-format
 msgid "Volume: %(volumeName)s is already part of storage group %(sgGroupName)s "
 msgstr ""
@@ -631,17 +626,23 @@ msgid ""
 "%(storageGroupInstanceName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:818
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:666
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:934
+#, python-format
+msgid "Unable to find Masking view: %(view)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:852
 #, python-format
 msgid "No storage group found. %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1415
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1439
 #, python-format
 msgid "No target ports found in masking view %(maskingView)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1461
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1485
 #, python-format
 msgid "No port group found in masking view %(mv)s"
 msgstr ""
@@ -819,6 +820,24 @@ msgstr ""
 msgid "terminate_connection: lun map not found"
 msgstr ""
 
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:792
+#, python-format
+msgid ""
+"Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but cleanup "
+"timed out."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:805
+#, python-format
+msgid ""
+"Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot deleted but error "
+"during cleanup. Error: %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:594
+msgid "terminate_conn: provider location empty."
+msgstr ""
+
 #: cinder/volume/drivers/hitachi/hbsd_common.py:392
 #: cinder/volume/drivers/hitachi/hbsd_common.py:399
 #: cinder/volume/drivers/hitachi/hbsd_horcm.py:1421
@@ -945,23 +964,23 @@ msgid ""
 " no host specified."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:369
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:370
 msgid "CHAP secret exists for host but CHAP is disabled"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:414
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:415
 #, python-format
 msgid "initialize_connection: Did not find a preferred node for volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:465
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:466
 #, python-format
 msgid ""
 "Unable to find a preferred node match for node %(node)s in the list of "
 "available WWPNs on %(host)s. Using first available."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:770
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:771
 #, python-format
 msgid "Volume %s does not exist."
 msgstr ""
@@ -1037,25 +1056,25 @@ msgstr ""
 msgid "Exception during deleting %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:427
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:425
 #, python-format
 msgid "Unexpected exception during image cloning in share %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:518
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:516
 msgid "Discover file retries exhausted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:576
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:574
 msgid "Unexpected exception while short listing used share."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:639
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:637
 #, python-format
 msgid "Destination %s already exists."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:647
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:645
 #, python-format
 msgid "Exception moving file %(src)s. Message - %(e)s"
 msgstr ""
@@ -1243,7 +1262,7 @@ msgstr ""
 msgid "Failed to query pool %(id)s status %(ret)d."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:393
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:404
 #, python-format
 msgid "Failed to manage virtual volume %(disp)s due to error during retype."
 msgstr ""
@@ -1270,12 +1289,12 @@ msgstr ""
 msgid "No VLUN contained CHAP credentials. Generating new CHAP key."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:380
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:437
 #, python-format
 msgid "CHAP secret exists for host %s but CHAP is disabled"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:383
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:440
 #, python-format
 msgid "CHAP is enabled, but server secret not configured on server %s"
 msgstr ""
@@ -1417,22 +1436,22 @@ msgstr ""
 msgid "Attempting recreate of backing lun..."
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:216
+#: cinder/volume/targets/tgt.py:203
 #, python-format
 msgid "Persistence file already exists for volume, found file at: %s"
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:246
+#: cinder/volume/targets/tgt.py:233
 #, python-format
 msgid "Could not create target because it already exists for volume: %s"
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:367
+#: cinder/volume/targets/tgt.py:361
 #, python-format
 msgid "Volume path %s does not exist, nothing to remove."
 msgstr ""
 
-#: cinder/volume/targets/tgt.py:401
+#: cinder/volume/targets/tgt.py:395
 msgid "Silent failure of target removal detected, retry...."
 msgstr ""
 
diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index 4e3f5a80bb1..0c976051a2d 100644
--- a/cinder/locale/cinder.pot
+++ b/cinder/locale/cinder.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 2015.1.dev158\n"
+"Project-Id-Version: cinder 2015.1.dev303\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-01-15 06:08+0000\n"
+"POT-Creation-Date: 2015-01-30 06:25+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"
@@ -455,229 +455,229 @@ msgstr ""
 
 #: cinder/exception.py:496
 #, python-format
+msgid "Connector doesn't have required information: %(missing)s"
+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:501
+#: cinder/exception.py:505
 #, python-format
 msgid "Glance metadata for volume/snapshot %(id)s cannot be found."
 msgstr ""
 
-#: cinder/exception.py:505
+#: cinder/exception.py:509
 #, python-format
 msgid "Failed to export for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:509
+#: cinder/exception.py:513
 #, python-format
 msgid "Failed to remove export for volume %(volume)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:513
+#: cinder/exception.py:517
 #, python-format
 msgid "Failed to create metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:517
+#: cinder/exception.py:521
 #, python-format
 msgid "Failed to update metadata for volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:521
+#: cinder/exception.py:525
 #, python-format
 msgid "Failed to copy metadata to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:525
+#: cinder/exception.py:529
 #, python-format
 msgid "Failed to copy image to volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:529
+#: cinder/exception.py:533
 msgid "Invalid Ceph args provided for backup rbd operation"
 msgstr ""
 
-#: cinder/exception.py:533
+#: cinder/exception.py:537
 msgid "An error has occurred during backup operation"
 msgstr ""
 
-#: cinder/exception.py:537
+#: cinder/exception.py:541
 msgid "Unsupported backup metadata version requested"
 msgstr ""
 
-#: cinder/exception.py:541
+#: cinder/exception.py:545
 msgid "Unsupported backup verify driver"
 msgstr ""
 
-#: cinder/exception.py:545
+#: cinder/exception.py:549
 msgid "Metadata backup already exists for this volume"
 msgstr ""
 
-#: cinder/exception.py:549
+#: cinder/exception.py:553
 msgid "Backup RBD operation failed"
 msgstr ""
 
-#: cinder/exception.py:553
+#: cinder/exception.py:557
 msgid "Backup operation of an encrypted volume failed."
 msgstr ""
 
-#: cinder/exception.py:557
+#: cinder/exception.py:561
 #, python-format
 msgid "Backup %(backup_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:561
-msgid "Failed to identify volume backend."
-msgstr ""
-
 #: cinder/exception.py:565
-#, python-format
-msgid "Invalid backup: %(reason)s"
+msgid "Failed to identify volume backend."
 msgstr ""
 
 #: cinder/exception.py:569
 #, python-format
-msgid "Connection to swift failed: %(reason)s"
+msgid "Invalid backup: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:573
 #, python-format
-msgid "Transfer %(transfer_id)s could not be found."
+msgid "Connection to swift failed: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:577
 #, python-format
-msgid "Volume migration failed: %(reason)s"
+msgid "Transfer %(transfer_id)s could not be found."
 msgstr ""
 
 #: cinder/exception.py:581
 #, python-format
-msgid "SSH command injection detected: %(command)s"
+msgid "Volume migration failed: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:585
 #, python-format
-msgid "QoS Specs %(specs_id)s already exists."
+msgid "SSH command injection detected: %(command)s"
 msgstr ""
 
 #: cinder/exception.py:589
 #, python-format
+msgid "QoS Specs %(specs_id)s already exists."
+msgstr ""
+
+#: cinder/exception.py:593
+#, python-format
 msgid "Failed to create qos_specs: %(name)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:594
+#: cinder/exception.py:598
 #, python-format
 msgid "Failed to update qos_specs: %(specs_id)s with specs %(qos_specs)s."
 msgstr ""
 
-#: cinder/exception.py:599
+#: cinder/exception.py:603
 #, python-format
 msgid "No such QoS spec %(specs_id)s."
 msgstr ""
 
-#: cinder/exception.py:603
+#: cinder/exception.py:607
 #, python-format
 msgid "Failed to associate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:608
+#: cinder/exception.py:612
 #, python-format
 msgid "Failed to disassociate qos_specs: %(specs_id)s with type %(type_id)s."
 msgstr ""
 
-#: cinder/exception.py:613
+#: cinder/exception.py:617
 #, python-format
 msgid "QoS spec %(specs_id)s has no spec with key %(specs_key)s."
 msgstr ""
 
-#: cinder/exception.py:618
+#: cinder/exception.py:622
 #, python-format
 msgid "Invalid qos specs: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:622
+#: cinder/exception.py:626
 #, python-format
 msgid "QoS Specs %(specs_id)s is still associated with entities."
 msgstr ""
 
-#: cinder/exception.py:626
+#: cinder/exception.py:630
 #, python-format
 msgid "key manager error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:630
+#: cinder/exception.py:634
 #, python-format
 msgid ""
 "Manage existing volume failed due to invalid backend reference "
 "%(existing_ref)s: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:635
+#: cinder/exception.py:639
 #, python-format
 msgid "Volume %(volume_id)s replication error: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:640
+#: cinder/exception.py:644
 #, python-format
 msgid "Volume replication for %(volume_id)s could not be found."
 msgstr ""
 
-#: cinder/exception.py:645
+#: cinder/exception.py:649
 #, python-format
 msgid "Manage existing volume failed due to volume type mismatch: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:650
+#: cinder/exception.py:654
 #, python-format
 msgid "Error extending volume: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:654
+#: cinder/exception.py:658
 #, python-format
 msgid "Error during evaluator parsing: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:660
+#: cinder/exception.py:664
 msgid "Coraid Cinder Driver exception."
 msgstr ""
 
-#: cinder/exception.py:664
+#: cinder/exception.py:668
 msgid "Failed to encode json data."
 msgstr ""
 
-#: cinder/exception.py:668
+#: cinder/exception.py:672
 msgid "Login on ESM failed."
 msgstr ""
 
-#: cinder/exception.py:672
-msgid "Relogin on ESM failed."
-msgstr ""
-
 #: cinder/exception.py:676
-#, python-format
-msgid "Group with name \"%(group_name)s\" not found."
+msgid "Relogin on ESM failed."
 msgstr ""
 
 #: cinder/exception.py:680
 #, python-format
-msgid "ESM configure request failed: %(reason)s"
+msgid "Group with name \"%(group_name)s\" not found."
 msgstr ""
 
 #: cinder/exception.py:684
 #, python-format
-msgid "Coraid ESM not available with reason: %(reason)s"
+msgid "ESM configure request failed: %(reason)s"
 msgstr ""
 
-#: cinder/exception.py:689
+#: cinder/exception.py:688
 #, python-format
-msgid "Pure Storage Cinder driver failure: %(reason)s"
+msgid "Coraid ESM not available with reason: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:693
 #, python-format
-msgid "Bad response from Pure Storage REST API: %(reason)s"
+msgid "Pure Storage Cinder driver failure: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:698
@@ -876,66 +876,45 @@ msgstr ""
 msgid "Failed to attach iSCSI target for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:926
-msgid "X-IO Volume Driver exception!"
+#: cinder/exception.py:925
+#, python-format
+msgid "Failed to detach iSCSI target for volume %(volume_id)s."
 msgstr ""
 
-#: cinder/exception.py:931
-#, python-format
-msgid "Volume backend config is invalid: %(reason)s"
+#: cinder/exception.py:930
+msgid "X-IO Volume Driver exception!"
 msgstr ""
 
 #: cinder/exception.py:935
 #, python-format
-msgid "Backend service retry timeout hit: %(timeout)s sec"
+msgid "Volume backend config is invalid: %(reason)s"
 msgstr ""
 
 #: cinder/exception.py:939
 #, python-format
-msgid "Backend reports: %(message)s"
+msgid "Backend service retry timeout hit: %(timeout)s sec"
 msgstr ""
 
 #: cinder/exception.py:943
-msgid "Backend reports: item already exists"
+#, python-format
+msgid "Backend reports: %(message)s"
 msgstr ""
 
 #: cinder/exception.py:947
+msgid "Backend reports: item already exists"
+msgstr ""
+
+#: cinder/exception.py:951
 msgid "Backend reports: item not found"
 msgstr ""
 
-#: cinder/exception.py:952
+#: cinder/exception.py:956
 #, python-format
 msgid ""
 "The WebDAV request failed. Reason: %(msg)s, Return code/reason: %(code)s,"
 " Source Volume: %(src)s, Destination Volume: %(dst)s, Method: %(method)s."
 msgstr ""
 
-#: cinder/flow_utils.py:78
-#, python-format
-msgid ""
-"Flow '%(flow_name)s' (%(flow_uuid)s) transitioned into state '%(state)s' "
-"from state '%(old_state)s'"
-msgstr ""
-
-#: cinder/flow_utils.py:99
-#, python-format
-msgid ""
-"Task '%(task_name)s' (%(task_uuid)s) transitioned into state '%(state)s'."
-" Exception: '%(exception_str)s'"
-msgstr ""
-
-#: cinder/flow_utils.py:106 cinder/flow_utils.py:129 cinder/flow_utils.py:140
-#, python-format
-msgid "Task '%(task_name)s' (%(task_uuid)s) transitioned into state '%(state)s'"
-msgstr ""
-
-#: cinder/flow_utils.py:121
-#, python-format
-msgid ""
-"Task '%(task_name)s' (%(task_uuid)s) transitioned into state '%(state)s' "
-"with result '%(result)s'"
-msgstr ""
-
 #: cinder/quota.py:118
 #, python-format
 msgid ""
@@ -1024,37 +1003,37 @@ msgstr ""
 msgid "Error connecting via ssh: %s"
 msgstr ""
 
-#: cinder/utils.py:95
+#: cinder/utils.py:96
 #, python-format
 msgid "Can not translate %s to integer."
 msgstr ""
 
-#: cinder/utils.py:134
+#: cinder/utils.py:135
 #, python-format
 msgid "May specify only one of %s"
 msgstr ""
 
-#: cinder/utils.py:291
+#: cinder/utils.py:292
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: cinder/utils.py:674
+#: cinder/utils.py:675
 #, python-format
 msgid "Unable to get a block device for file '%s'"
 msgstr ""
 
-#: cinder/utils.py:686
+#: cinder/utils.py:687
 #, python-format
 msgid "%s is not a string or unicode"
 msgstr ""
 
-#: cinder/utils.py:690
+#: cinder/utils.py:691
 #, python-format
 msgid "%(name)s has a minimum character requirement of %(min_length)s."
 msgstr ""
 
-#: cinder/utils.py:695
+#: cinder/utils.py:696
 #, python-format
 msgid "%(name)s has more than %(max_length)s characters."
 msgstr ""
@@ -1090,12 +1069,12 @@ msgid "You must implement __call__"
 msgstr ""
 
 #: cinder/api/common.py:95 cinder/api/common.py:129
-#: cinder/consistencygroup/api.py:312 cinder/volume/api.py:372
+#: cinder/consistencygroup/api.py:312 cinder/volume/api.py:392
 msgid "limit param must be an integer"
 msgstr ""
 
 #: cinder/api/common.py:98 cinder/api/common.py:133
-#: cinder/consistencygroup/api.py:309 cinder/volume/api.py:369
+#: cinder/consistencygroup/api.py:309 cinder/volume/api.py:389
 msgid "limit param must be positive"
 msgstr ""
 
@@ -1397,59 +1376,59 @@ msgid ""
 msgstr ""
 
 #: cinder/api/contrib/volume_actions.py:193
-#: cinder/api/contrib/volume_actions.py:216
+#: cinder/api/contrib/volume_actions.py:219
 msgid "Must specify 'connector'"
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:199
+#: cinder/api/contrib/volume_actions.py:202
 msgid "Unable to fetch connection information from backend."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:220
+#: cinder/api/contrib/volume_actions.py:223
 msgid "Unable to terminate volume connection from backend."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:233
+#: cinder/api/contrib/volume_actions.py:236
 msgid "No image_name was specified in request."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:241
+#: cinder/api/contrib/volume_actions.py:244
 msgid "Bad value for 'force' parameter."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:244
+#: cinder/api/contrib/volume_actions.py:247
 msgid "'force' is not string or bool."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:286
+#: cinder/api/contrib/volume_actions.py:289
 msgid "New volume size must be specified as an integer."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:305
+#: cinder/api/contrib/volume_actions.py:308
 msgid "Must specify readonly in request."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:313
+#: cinder/api/contrib/volume_actions.py:316
 msgid "Bad value for 'readonly'"
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:317
+#: cinder/api/contrib/volume_actions.py:320
 msgid "'readonly' not string or bool"
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:331
+#: cinder/api/contrib/volume_actions.py:334
 msgid "New volume type must be specified."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:350
+#: cinder/api/contrib/volume_actions.py:353
 msgid "Must specify bootable in request."
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:358
+#: cinder/api/contrib/volume_actions.py:361
 msgid "Bad value for 'bootable'"
 msgstr ""
 
-#: cinder/api/contrib/volume_actions.py:362
+#: cinder/api/contrib/volume_actions.py:365
 msgid "'bootable' not string or bool"
 msgstr ""
 
@@ -2156,7 +2135,7 @@ msgstr ""
 msgid "Failed to flush IO buffers prior to removing device: (%(code)s)"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:609
+#: cinder/brick/local_dev/lvm.py:649
 #, python-format
 msgid "Error reported running lvremove: CMD: %(command)s, RESPONSE: %(response)s"
 msgstr ""
@@ -2178,144 +2157,144 @@ msgstr ""
 msgid "NFS mount failed for share %(sh)s. Error - %(error)s"
 msgstr ""
 
-#: cinder/cmd/manage.py:182
+#: cinder/cmd/manage.py:189
 msgid ""
 "The above error may show that the database has not been created.\n"
 "Please create a database using 'cinder-manage db sync' before running "
 "this command."
 msgstr ""
 
-#: cinder/cmd/manage.py:197
+#: cinder/cmd/manage.py:204
 #, python-format
 msgid "%(host)-25s\t%(zone)-15s"
 msgstr ""
 
-#: cinder/cmd/manage.py:208
+#: cinder/cmd/manage.py:215
 #, python-format
 msgid "%(host)-25s\t%(availability_zone)-15s"
 msgstr ""
 
-#: cinder/cmd/manage.py:270
+#: cinder/cmd/manage.py:277
 msgid "Volume not yet assigned to host."
 msgstr ""
 
-#: cinder/cmd/manage.py:271
+#: cinder/cmd/manage.py:278
 msgid "Deleting volume from database and skipping rpc."
 msgstr ""
 
-#: cinder/cmd/manage.py:276
+#: cinder/cmd/manage.py:283
 msgid "Volume is in-use."
 msgstr ""
 
-#: cinder/cmd/manage.py:277
+#: cinder/cmd/manage.py:284
 msgid "Detach volume from instance and then try again."
 msgstr ""
 
-#: cinder/cmd/manage.py:343
+#: cinder/cmd/manage.py:350
 #, python-format
 msgid "Line %(dis)d : %(line)s"
 msgstr ""
 
-#: cinder/cmd/manage.py:346
+#: cinder/cmd/manage.py:353
 msgid "No errors in logfiles!"
 msgstr ""
 
-#: cinder/cmd/manage.py:360
+#: cinder/cmd/manage.py:367
 msgid "Unable to find system log file!"
 msgstr ""
 
-#: cinder/cmd/manage.py:364
+#: cinder/cmd/manage.py:371
 #, python-format
 msgid "Last %s cinder syslog entries:-"
 msgstr ""
 
-#: cinder/cmd/manage.py:368
+#: cinder/cmd/manage.py:375
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: cinder/cmd/manage.py:373
+#: cinder/cmd/manage.py:380
 msgid "No cinder entries in syslog!"
 msgstr ""
 
-#: cinder/cmd/manage.py:387
+#: cinder/cmd/manage.py:394
 msgid "ID"
 msgstr ""
 
-#: cinder/cmd/manage.py:388
+#: cinder/cmd/manage.py:395
 msgid "User ID"
 msgstr ""
 
-#: cinder/cmd/manage.py:389
+#: cinder/cmd/manage.py:396
 msgid "Project ID"
 msgstr ""
 
-#: cinder/cmd/manage.py:390 cinder/cmd/manage.py:421
+#: cinder/cmd/manage.py:397 cinder/cmd/manage.py:428
 msgid "Host"
 msgstr ""
 
-#: cinder/cmd/manage.py:391
+#: cinder/cmd/manage.py:398
 msgid "Name"
 msgstr ""
 
-#: cinder/cmd/manage.py:392
+#: cinder/cmd/manage.py:399
 msgid "Container"
 msgstr ""
 
-#: cinder/cmd/manage.py:393 cinder/cmd/manage.py:423
+#: cinder/cmd/manage.py:400 cinder/cmd/manage.py:430
 msgid "Status"
 msgstr ""
 
-#: cinder/cmd/manage.py:394
+#: cinder/cmd/manage.py:401
 msgid "Size"
 msgstr ""
 
-#: cinder/cmd/manage.py:395
+#: cinder/cmd/manage.py:402
 msgid "Object Count"
 msgstr ""
 
-#: cinder/cmd/manage.py:420
+#: cinder/cmd/manage.py:427
 msgid "Binary"
 msgstr ""
 
-#: cinder/cmd/manage.py:422
+#: cinder/cmd/manage.py:429
 msgid "Zone"
 msgstr ""
 
-#: cinder/cmd/manage.py:424
+#: cinder/cmd/manage.py:431
 msgid "State"
 msgstr ""
 
-#: cinder/cmd/manage.py:425
+#: cinder/cmd/manage.py:432
 msgid "Updated At"
 msgstr ""
 
-#: cinder/cmd/manage.py:517
+#: cinder/cmd/manage.py:524
 #, python-format
 msgid ""
 "\n"
 "OpenStack Cinder version: %(version)s\n"
 msgstr ""
 
-#: cinder/cmd/manage.py:520
+#: cinder/cmd/manage.py:527
 msgid "Available categories:"
 msgstr ""
 
-#: cinder/cmd/manage.py:522
+#: cinder/cmd/manage.py:529
 #, python-format
 msgid "\t%s"
 msgstr ""
 
-#: cinder/cmd/manage.py:533
+#: cinder/cmd/manage.py:540
 #, python-format
 msgid "Could not read %s. Re-running with sudo"
 msgstr ""
 
-#: cinder/cmd/manage.py:537
+#: cinder/cmd/manage.py:544
 msgid "sudo failed, continuing as if nothing happened"
 msgstr ""
 
-#: cinder/cmd/manage.py:539
+#: cinder/cmd/manage.py:546
 msgid "Please re-run cinder-manage as root."
 msgstr ""
 
@@ -2435,56 +2414,56 @@ msgstr ""
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1355
+#: cinder/db/sqlalchemy/api.py:1306
 msgid "'migration_status' column could not be found."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1365
+#: cinder/db/sqlalchemy/api.py:1316
 msgid "'metadata' filter value is not valid."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1375
+#: cinder/db/sqlalchemy/api.py:1326
 #, python-format
 msgid "'%s' filter key is not valid, it maps to a relationship."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:1380
+#: cinder/db/sqlalchemy/api.py:1331
 #, python-format
 msgid "'%s' filter key is not valid."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2177
+#: cinder/db/sqlalchemy/api.py:2128
 #, python-format
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:2945
+#: cinder/db/sqlalchemy/api.py:2896
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3029
+#: cinder/db/sqlalchemy/api.py:2980
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3055
+#: cinder/db/sqlalchemy/api.py:3006
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3077
+#: cinder/db/sqlalchemy/api.py:3028
 #, python-format
 msgid ""
 "Transfer %(transfer_id)s: Volume id %(volume_id)s in unexpected state "
 "%(status)s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3183
+#: cinder/db/sqlalchemy/api.py:3128
 #, python-format
 msgid "No consistency group with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3271
+#: cinder/db/sqlalchemy/api.py:3211
 #, python-format
 msgid "No cgsnapshot with id %s"
 msgstr ""
@@ -2646,56 +2625,56 @@ msgstr ""
 msgid "Error contacting glance server '%(netloc)s' for '%(method)s', %(extra)s."
 msgstr ""
 
-#: cinder/image/image_utils.py:108
+#: cinder/image/image_utils.py:109
 #, python-format
 msgid "Converted %(sz).2f MB image at %(mbps).2f MB/s"
 msgstr ""
 
-#: cinder/image/image_utils.py:140
+#: cinder/image/image_utils.py:141
 #, python-format
 msgid "Image download %(sz).2f MB at %(mbps).2f MB/s"
 msgstr ""
 
-#: cinder/image/image_utils.py:155 cinder/image/image_utils.py:259
+#: cinder/image/image_utils.py:156 cinder/image/image_utils.py:261
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: cinder/image/image_utils.py:162
+#: cinder/image/image_utils.py:163
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:170 cinder/image/image_utils.py:252
+#: cinder/image/image_utils.py:171 cinder/image/image_utils.py:254
 #, python-format
 msgid ""
 "Size is %(image_size)dGB and doesn't fit in a volume of size "
 "%(volume_size)dGB."
 msgstr ""
 
-#: cinder/image/image_utils.py:217
+#: cinder/image/image_utils.py:218
 #, 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:224
+#: cinder/image/image_utils.py:225
 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:266
+#: cinder/image/image_utils.py:268
 #, python-format
 msgid "fmt=%(fmt)s backed by:%(backing_file)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:286
+#: cinder/image/image_utils.py:288
 #, python-format
 msgid "Converted to %(vol_format)s, but format is now %(file_format)s"
 msgstr ""
 
-#: cinder/image/image_utils.py:318
+#: cinder/image/image_utils.py:320
 #, python-format
 msgid "Converted to %(f1)s, but format is now %(f2)s"
 msgstr ""
@@ -2778,16 +2757,6 @@ msgstr ""
 msgid "Rules must be an instance of dict or Rules, got %s instead"
 msgstr ""
 
-#: cinder/openstack/common/request_utils.py:69
-#, python-format
-msgid "TargetId=%(id)s "
-msgstr ""
-
-#: cinder/openstack/common/request_utils.py:73
-#, python-format
-msgid "Target='%(name)s' "
-msgstr ""
-
 #: cinder/openstack/common/strutils.py:125
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
@@ -2986,8 +2955,8 @@ msgstr ""
 msgid "ParseException: %s"
 msgstr ""
 
-#: cinder/scheduler/filters/instance_locality_filter.py:100
-#: cinder/scheduler/filters/instance_locality_filter.py:112
+#: cinder/scheduler/filters/instance_locality_filter.py:99
+#: cinder/scheduler/filters/instance_locality_filter.py:111
 #, python-format
 msgid "Hint \"%s\" not supported."
 msgstr ""
@@ -3042,7 +3011,7 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: cinder/tests/test_rbd.py:974
+#: cinder/tests/test_rbd.py:1014
 msgid "flush() not supported in this version of librbd"
 msgstr ""
 
@@ -3076,7 +3045,7 @@ msgstr ""
 msgid "volume_types must be provided to create consistency group %s."
 msgstr ""
 
-#: cinder/tests/api/middleware/test_faults.py:124
+#: cinder/tests/api/middleware/test_faults.py:118
 #, python-format
 msgid "String with params: %s"
 msgstr ""
@@ -3186,29 +3155,33 @@ msgstr ""
 msgid "Failed to create api volume flow"
 msgstr ""
 
-#: cinder/volume/api.py:290
+#: cinder/volume/api.py:292
 #, python-format
 msgid "Volume status must be available or error, but current status is: %s"
 msgstr ""
 
-#: cinder/volume/api.py:296
+#: cinder/volume/api.py:305
 msgid "Volume cannot be deleted while migrating"
 msgstr ""
 
-#: cinder/volume/api.py:301
+#: cinder/volume/api.py:309
+msgid "Volume cannot be deleted while in a consistency group."
+msgstr ""
+
+#: cinder/volume/api.py:319
 #, python-format
 msgid "Volume still has %d dependent snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:351
+#: cinder/volume/api.py:371
 msgid "all_tenants param must be 0 or 1"
 msgstr ""
 
-#: cinder/volume/api.py:446
+#: cinder/volume/api.py:466
 msgid "Volume status must be available to reserve"
 msgstr ""
 
-#: cinder/volume/api.py:465
+#: cinder/volume/api.py:485
 #, python-format
 msgid ""
 "Unable to detach volume. Volume status must be 'in-use' and attach_status"
@@ -3216,162 +3189,162 @@ msgid ""
 "attach_status: '%(attach_status)s'"
 msgstr ""
 
-#: cinder/volume/api.py:549 cinder/volume/api.py:667
+#: cinder/volume/api.py:569 cinder/volume/api.py:687
 msgid "Snapshot cannot be created while volume is migrating"
 msgstr ""
 
-#: cinder/volume/api.py:554
+#: cinder/volume/api.py:574
 msgid "Snapshot of secondary replica is not allowed."
 msgstr ""
 
-#: cinder/volume/api.py:558
+#: cinder/volume/api.py:578
 msgid "must be available"
 msgstr ""
 
-#: cinder/volume/api.py:580 cinder/volume/api.py:708
+#: cinder/volume/api.py:600 cinder/volume/api.py:728
 #, 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:592 cinder/volume/api.py:720
+#: cinder/volume/api.py:612 cinder/volume/api.py:740
 #, python-format
 msgid ""
 "Quota exceeded for %(s_pid)s, tried to create snapshot (%(d_consumed)d "
 "snapshots already consumed)"
 msgstr ""
 
-#: cinder/volume/api.py:671
+#: cinder/volume/api.py:691
 #, python-format
 msgid "Snapshot cannot be created because volume '%s' is not available."
 msgstr ""
 
-#: cinder/volume/api.py:762
+#: cinder/volume/api.py:788
 msgid "Volume Snapshot status must be available or error"
 msgstr ""
 
-#: cinder/volume/api.py:766
+#: cinder/volume/api.py:795
 #, python-format
 msgid ""
 "Snapshot %s is part of a cgsnapshot and has to be deleted together with "
 "the cgsnapshot."
 msgstr ""
 
-#: cinder/volume/api.py:796 cinder/volume/flows/api/create_volume.py:266
+#: cinder/volume/api.py:827 cinder/volume/flows/api/create_volume.py:266
 msgid "Metadata property key blank"
 msgstr ""
 
-#: cinder/volume/api.py:800
+#: cinder/volume/api.py:831
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:804
+#: cinder/volume/api.py:835
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: cinder/volume/api.py:935 cinder/volume/api.py:1031
+#: cinder/volume/api.py:966 cinder/volume/api.py:1062
 msgid "Volume status must be available/in-use."
 msgstr ""
 
-#: cinder/volume/api.py:938
+#: cinder/volume/api.py:969
 msgid "Volume status is in-use."
 msgstr ""
 
-#: cinder/volume/api.py:986
+#: cinder/volume/api.py:1017
 msgid "Volume status must be available to extend."
 msgstr ""
 
-#: cinder/volume/api.py:991
+#: cinder/volume/api.py:1022
 #, 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:1009
+#: cinder/volume/api.py:1040
 #, 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/api.py:1037
+#: cinder/volume/api.py:1068
 msgid "Volume is already part of an active migration"
 msgstr ""
 
-#: cinder/volume/api.py:1043
+#: cinder/volume/api.py:1074
 msgid "volume must not have snapshots"
 msgstr ""
 
-#: cinder/volume/api.py:1050 cinder/volume/manager.py:1484
+#: cinder/volume/api.py:1081 cinder/volume/manager.py:1490
 msgid "Volume must not be replicated."
 msgstr ""
 
-#: cinder/volume/api.py:1056 cinder/volume/api.py:1156
+#: cinder/volume/api.py:1087 cinder/volume/api.py:1187
 msgid "Volume must not be part of a consistency group."
 msgstr ""
 
-#: cinder/volume/api.py:1072
+#: cinder/volume/api.py:1103
 #, python-format
 msgid "No available service named %s"
 msgstr ""
 
-#: cinder/volume/api.py:1078
+#: cinder/volume/api.py:1109
 msgid "Destination host must be different than current host"
 msgstr ""
 
-#: cinder/volume/api.py:1108
+#: cinder/volume/api.py:1139
 msgid "Source volume not mid-migration."
 msgstr ""
 
-#: cinder/volume/api.py:1112
+#: cinder/volume/api.py:1143
 msgid "Destination volume not mid-migration."
 msgstr ""
 
-#: cinder/volume/api.py:1117
+#: cinder/volume/api.py:1148
 #, python-format
 msgid "Destination has migration_status %(stat)s, expected %(exp)s."
 msgstr ""
 
-#: cinder/volume/api.py:1128
+#: cinder/volume/api.py:1159
 msgid "Volume status must be available to update readonly flag."
 msgstr ""
 
-#: cinder/volume/api.py:1137
-#, python-format
-msgid "Unable to update type due to incorrect status on volume: %s"
-msgstr ""
-
-#: cinder/volume/api.py:1143
-#, python-format
-msgid "Volume %s is already part of an active migration."
-msgstr ""
-
-#: cinder/volume/api.py:1149
-#, python-format
-msgid "migration_policy must be 'on-demand' or 'never', passed: %s"
-msgstr ""
-
 #: cinder/volume/api.py:1168
 #, python-format
+msgid "Unable to update type due to incorrect status on volume: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1174
+#, python-format
+msgid "Volume %s is already part of an active migration."
+msgstr ""
+
+#: cinder/volume/api.py:1180
+#, python-format
+msgid "migration_policy must be 'on-demand' or 'never', passed: %s"
+msgstr ""
+
+#: cinder/volume/api.py:1199
+#, python-format
 msgid "Invalid volume_type passed: %s"
 msgstr ""
 
-#: cinder/volume/api.py:1181
+#: cinder/volume/api.py:1212
 #, python-format
 msgid "New volume_type same as original: %s"
 msgstr ""
 
-#: cinder/volume/api.py:1196
+#: cinder/volume/api.py:1227
 msgid "Retype cannot change encryption requirements"
 msgstr ""
 
-#: cinder/volume/api.py:1208
+#: cinder/volume/api.py:1239
 msgid "Retype cannot change front-end qos specs for in-use volumes"
 msgstr ""
 
-#: cinder/volume/driver.py:268 cinder/volume/manager.py:972
+#: cinder/volume/driver.py:268 cinder/volume/manager.py:978
 #, python-format
 msgid "Unable to terminate volume connection: %(err)s"
 msgstr ""
@@ -3386,8 +3359,7 @@ msgstr ""
 msgid "Failed to copy volume %(src)s to %(dest)s."
 msgstr ""
 
-#: cinder/volume/driver.py:497 cinder/volume/manager.py:890
-#: cinder/volume/manager.py:921
+#: cinder/volume/driver.py:497 cinder/volume/manager.py:927
 #, python-format
 msgid "Unable to fetch connection information from backend: %(err)s"
 msgstr ""
@@ -3402,152 +3374,146 @@ msgstr ""
 msgid "Unable to access the backend storage via the path %(path)s."
 msgstr ""
 
-#: cinder/volume/driver.py:612
+#: cinder/volume/driver.py:614
 msgid "Extend volume not implemented"
 msgstr ""
 
-#: cinder/volume/driver.py:693 cinder/volume/driver.py:701
+#: cinder/volume/driver.py:695 cinder/volume/driver.py:703
 msgid "Manage existing volume not implemented."
 msgstr ""
 
-#: cinder/volume/driver.py:763
+#: cinder/volume/driver.py:765
 msgid "sync_replica not implemented."
 msgstr ""
 
-#: cinder/volume/driver.py:810
+#: cinder/volume/driver.py:812
 msgid "promote_replica not implemented."
 msgstr ""
 
-#: cinder/volume/driver.py:966 cinder/volume/targets/iscsi.py:79
+#: cinder/volume/driver.py:981 cinder/volume/targets/iscsi.py:79
 #, python-format
 msgid "Could not find iSCSI export for volume %s"
 msgstr ""
 
-#: cinder/volume/driver.py:1068 cinder/volume/targets/iscsi.py:187
-msgid "The volume driver requires the iSCSI initiator name in the connector."
-msgstr ""
-
-#: cinder/volume/driver.py:1334
+#: cinder/volume/driver.py:1352
 msgid "Driver must implement initialize_connection"
 msgstr ""
 
-#: cinder/volume/driver.py:1349
-#, python-format
-msgid ""
-"FibreChannelDriver validate_connector failed. No '%s'. Make sure HBA "
-"state is Online."
-msgstr ""
-
-#: cinder/volume/manager.py:378
+#: cinder/volume/manager.py:382
 msgid "Failed to create manager volume flow."
 msgstr ""
 
-#: cinder/volume/manager.py:453
+#: cinder/volume/manager.py:457
 msgid "volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:666
+#: cinder/volume/manager.py:670
 msgid "being attached by another instance"
 msgstr ""
 
-#: cinder/volume/manager.py:670
+#: cinder/volume/manager.py:674
 msgid "being attached by another host"
 msgstr ""
 
-#: cinder/volume/manager.py:674
+#: cinder/volume/manager.py:678
 msgid "being attached by different mode"
 msgstr ""
 
-#: cinder/volume/manager.py:678
+#: cinder/volume/manager.py:682
 msgid "status must be available or attaching"
 msgstr ""
 
-#: cinder/volume/manager.py:902
+#: cinder/volume/manager.py:896
+#, python-format
+msgid "Unable to validate connector information in backend: %(err)s"
+msgstr ""
+
+#: cinder/volume/manager.py:908
 #, python-format
 msgid "Unable to create export for volume %(volume_id)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1049
+#: cinder/volume/manager.py:1055
 msgid "failed to create new_volume on destination host"
 msgstr ""
 
-#: cinder/volume/manager.py:1052
+#: cinder/volume/manager.py:1058
 msgid "timeout creating new_volume on destination host"
 msgstr ""
 
-#: cinder/volume/manager.py:1076
+#: cinder/volume/manager.py:1082
 #, python-format
 msgid "Failed to copy volume %(vol1)s to %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1105
+#: cinder/volume/manager.py:1111
 #, python-format
 msgid ""
 "migrate_volume_completion: completing migration for volume %(vol1)s "
 "(temporary volume %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1115
+#: cinder/volume/manager.py:1121
 #, python-format
 msgid ""
 "migrate_volume_completion is cleaning up an error for volume %(vol1)s "
 "(temporary volume %(vol2)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1134
+#: cinder/volume/manager.py:1140
 #, python-format
 msgid "Failed to delete migration source vol %(vol)s: %(err)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1347
+#: cinder/volume/manager.py:1353
 #, python-format
 msgid "Volume %s: Error trying to extend volume"
 msgstr ""
 
-#: cinder/volume/manager.py:1422
+#: cinder/volume/manager.py:1428
 msgid "Failed to get old volume type quota reservations"
 msgstr ""
 
-#: cinder/volume/manager.py:1467
+#: cinder/volume/manager.py:1473
 msgid "Retype requires migration but is not allowed."
 msgstr ""
 
-#: cinder/volume/manager.py:1475
+#: cinder/volume/manager.py:1481
 msgid "Volume must not have snapshots."
 msgstr ""
 
-#: cinder/volume/manager.py:1525
+#: cinder/volume/manager.py:1531
 msgid "Failed to create manage existing flow."
 msgstr ""
 
-#: cinder/volume/manager.py:1565
+#: cinder/volume/manager.py:1571
 msgid "Error promoting secondary volume to primary"
 msgstr ""
 
-#: cinder/volume/manager.py:1575 cinder/volume/manager.py:1606
+#: cinder/volume/manager.py:1581 cinder/volume/manager.py:1612
 #, python-format
 msgid "Failed updating model with driver provided model %(model)s"
 msgstr ""
 
-#: cinder/volume/manager.py:1596
+#: cinder/volume/manager.py:1602
 msgid "Error synchronizing secondary volume to primary"
 msgstr ""
 
-#: cinder/volume/manager.py:1713
+#: cinder/volume/manager.py:1719
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: cinder/volume/manager.py:1741
+#: cinder/volume/manager.py:1747
 #, python-format
 msgid "Error occurred when deleting consistency group %s."
 msgstr ""
 
-#: cinder/volume/manager.py:1849
+#: cinder/volume/manager.py:1855
 #, python-format
 msgid "Error occurred when creating cgsnapshot %s."
 msgstr ""
 
-#: cinder/volume/manager.py:1935
+#: cinder/volume/manager.py:1941
 #, python-format
 msgid "Error occurred when deleting cgsnapshot %s."
 msgstr ""
@@ -3678,334 +3644,82 @@ msgid "Request to Datera cluster returned bad status: %(status)s | %(reason)s"
 msgstr ""
 
 #: cinder/volume/drivers/drbdmanagedrv.py:131
+msgid ""
+"DRBDmanage driver setup error: some required libraries (dbus, "
+"drbdmanage.*) not found."
+msgstr ""
+
+#: cinder/volume/drivers/drbdmanagedrv.py:136
 msgid "Cannot ping DRBDmanage backend"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:155
+#: cinder/volume/drivers/drbdmanagedrv.py:160
 #, python-format
 msgid "Received error string: %s"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:222
+#: cinder/volume/drivers/drbdmanagedrv.py:227
 #, python-format
 msgid "volume %s not found in drbdmanage"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:225
+#: cinder/volume/drivers/drbdmanagedrv.py:230
 #, python-format
 msgid "multiple resources with name %s found by drbdmanage"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:231
+#: cinder/volume/drivers/drbdmanagedrv.py:236
 #, python-format
 msgid "not exactly one volume with id %s"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:259
+#: cinder/volume/drivers/drbdmanagedrv.py:264
 #, python-format
 msgid "no snapshot with id %s found in drbdmanage"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:263
+#: cinder/volume/drivers/drbdmanagedrv.py:268
 #, python-format
 msgid "multiple resources with snapshot ID %s found"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:269
+#: cinder/volume/drivers/drbdmanagedrv.py:274
 #, python-format
 msgid "not exactly one snapshot with id %s"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:291
+#: cinder/volume/drivers/drbdmanagedrv.py:296
 #, python-format
 msgid "Got bad path information from DRBDmanage! (%s)"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:454
+#: cinder/volume/drivers/drbdmanagedrv.py:459
 #, python-format
 msgid "Snapshot res \"%s\" that is not deployed anywhere?"
 msgstr ""
 
-#: cinder/volume/drivers/drbdmanagedrv.py:474
+#: cinder/volume/drivers/drbdmanagedrv.py:479
 #, python-format
 msgid "Resource \"%(res)s\" for snapshot \"%(sn)s\" not found"
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:174
+#: cinder/volume/drivers/eqlx.py:145
+msgid "The EQL array has closed the connection."
+msgstr ""
+
+#: cinder/volume/drivers/eqlx.py:183
 msgid "Error executing EQL command"
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:218
+#: cinder/volume/drivers/eqlx.py:227
 #, python-format
 msgid "SSH Command failed after '%(total_attempts)r' attempts : '%(command)s'"
 msgstr ""
 
-#: cinder/volume/drivers/eqlx.py:231
+#: cinder/volume/drivers/eqlx.py:242
 msgid "eqlx_cli_max_retries must be greater than or equal to 0"
 msgstr ""
 
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:184
-#, python-format
-msgid ""
-"Error Create Volume: %(volumename)s. Storage Configuration Service not "
-"found for pool %(storage_type)s."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:310
-#, 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/fujitsu_eternus_dx_common.py:350
-#, 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/fujitsu_eternus_dx_common.py:419
-#, 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/fujitsu_eternus_dx_common.py:459
-#, 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/fujitsu_eternus_dx_common.py:527
-#, python-format
-msgid ""
-"Error Delete Volume: %(volumename)s. Storage Configuration Service not "
-"found."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:556
-#, python-format
-msgid ""
-"Error Delete Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
-"%(error)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:598
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:727
-#, python-format
-msgid "Cannot find Replication Service to create snapshot for volume %s."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:642
-#, python-format
-msgid "Create Snapshot: %(snapshotname)s. Storage Configuration Service not found"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:665
-#, python-format
-msgid ""
-"Error Create Snapshot: %(snapshot)s Volume: %(volume)s Error: "
-"%(errordesc)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:759
-#, python-format
-msgid ""
-"Error Delete Snapshot: Volume: %(volumename)s  Snapshot: "
-"%(snapshotname)s. Return code: %(rc)lu. Error: %(error)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:862
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:881
-#, python-format
-msgid "Error mapping volume %(volumename)s.rc:%(rc)lu"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:886
-#, python-format
-msgid "Error mapping volume %(volumename)s:%(results)s."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:923
-#, python-format
-msgid "Error unmapping volume %(volumename)s.rc:%(rc)lu"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:943
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:969
-#, python-format
-msgid "Cannot find Controller Configuration Service for storage system %s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1033
-#, python-format
-msgid ""
-"Error Extend Volume: %(volumename)s. Storage Configuration Service not "
-"found."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1069
-#, python-format
-msgid ""
-"Error Extend Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
-"%(error)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1124
-msgid "Storage type not found."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1147
-msgid "Snap pool not found."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1219
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1152
-msgid "Cannot connect to ECOM server"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1301
-#, python-format
-msgid "Pool %(storage_type)s is not found."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1307
-#, python-format
-msgid "Storage system not found for pool %(storage_type)s."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1398
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1313
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:451
-#, python-format
-msgid "Error finding %s."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1429
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:309
-msgid "Issue encountered waiting for job."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1493
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:370
-msgid "Issue encountered waiting for synchronization."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1601
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2259
-#, python-format
-msgid ""
-"Volume %(name)s not found on the array. Cannot determine if there are "
-"volumes mapped."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1769
-msgid "_create_volume_name,id_code is None."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1804
-#, python-format
-msgid ""
-"_get_pool_instance_id,poolname:%(poolname)s,EnumerateInstances,cannot "
-"connect to ETERNUS."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1827
-#, python-format
-msgid "_get_pool_instance_id,poolname:%(poolname)s,poolinstanceid is None."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1853
-#, python-format
-msgid ""
-"get_target_portid,connector:%(connector)s,EnumerateInstances,cannot "
-"connect to ETERNUS."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1876
-#, python-format
-msgid ""
-"get_target_portid,protcol:%(protocol)s,connector:%(connector)s,target_portid"
-" does not found."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1915
-msgid "_find_copysession,Cannot find Replication Service to find copysession"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1936
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:2025
-#, python-format
-msgid ""
-"_find_copysession,source_volumename:%(volumename)s,Return "
-"code:%(rc)lu,Error:%(errordesc)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1956
-#, python-format
-msgid ""
-"_find_copysession,source_volumename:%(volumename)s,GetInstance,cannot "
-"connect to ETERNUS."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1979
-#, python-format
-msgid ""
-"_find_copy_session,source_volumename:%(volumename)s,wait for end of "
-"copysession"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1996
-#, python-format
-msgid ""
-"_find_copysession,source_volumename:%(volumename)s,copysession state is "
-"BROKEN"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:2047
-#, python-format
-msgid ""
-"_find_copysession,target_volumename:%(volumename)s,GetInstance,cannot "
-"connect to ETERNUS."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:2079
-#, python-format
-msgid "_find_copysession,volumename:%(volumename)s,not found."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:2103
-#, python-format
-msgid ""
-"_delete_copysession, copysession:%(cpsession)s,GetInstance,cannot connect"
-" to ETERNUS."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:2118
-msgid "_delete_copysession,Cannot find Replication Service to delete copysession"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:2147
-#, python-format
-msgid ""
-"_delete_copysession,copysession:%(cpsession)s,operation:%(operation)s,Return"
-" code:%(rc)lu,Error:%(errordesc)s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py:190
-#, python-format
-msgid "Could not find iSCSI export  for volume %s"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_iscsi.py:199
-#, python-format
-msgid "Cannot find device number for volume %s"
-msgstr ""
-
 #: cinder/volume/drivers/glusterfs.py:135
 #, python-format
 msgid "There's no Gluster config file configured (%s)"
@@ -4055,37 +3769,37 @@ msgstr ""
 msgid "Backup is only supported for raw-formatted GlusterFS volumes."
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:232 cinder/volume/drivers/lvm.py:241
+#: cinder/volume/drivers/lvm.py:238 cinder/volume/drivers/lvm.py:247
 #, python-format
 msgid "Volume Group %s does not exist"
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:248
+#: cinder/volume/drivers/lvm.py:254
 msgid "Thin provisioning not supported on this version of LVM."
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:257
+#: cinder/volume/drivers/lvm.py:263
 #, python-format
 msgid "Failed to create thin pool, error message was: %s"
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:436
+#: cinder/volume/drivers/lvm.py:446
 #, python-format
 msgid "Failed to rename logical volume %(name)s, error message was: %(err_msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:452 cinder/volume/drivers/rbd.py:946
+#: cinder/volume/drivers/lvm.py:462 cinder/volume/drivers/rbd.py:955
 msgid "Reference must contain source-name element."
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:469 cinder/volume/drivers/rbd.py:970
+#: cinder/volume/drivers/lvm.py:479 cinder/volume/drivers/rbd.py:979
 #, python-format
 msgid ""
 "Failed to manage existing volume %(name)s, because reported size %(size)s"
 " was not a floating-point number."
 msgstr ""
 
-#: cinder/volume/drivers/lvm.py:532
+#: cinder/volume/drivers/lvm.py:542
 #, python-format
 msgid ""
 "Refusing to migrate volume ID: %(id)s. Please check your configuration "
@@ -4149,40 +3863,35 @@ msgstr ""
 msgid "API %(name)s failed with error string %(err)s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:275
+#: cinder/volume/drivers/pure.py:118
+msgid ""
+"Missing 'purestorage' python module, ensure the library is installed and "
+"available."
+msgstr ""
+
+#: cinder/volume/drivers/pure.py:288
 msgid "No reachable iSCSI-enabled ports on target array."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:311
+#: cinder/volume/drivers/pure.py:325
 msgid "Unable to connect or find connection to host"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:517
-#, python-format
+#: cinder/volume/drivers/pure.py:508
 msgid ""
-"Unable to find usable REST API version. Response from Pure Storage REST "
-"API: %s"
+"PureISCSIDriver manage_existing requires a 'name' key to identify an "
+"existing volume."
 msgstr ""
 
 #: cinder/volume/drivers/pure.py:527
 #, python-format
-msgid "exception:%s"
+msgid "Unable to find volume with name=%s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:532
-#, python-format
-msgid "Unable to connect to %r. Check san_ip."
-msgstr ""
-
-#: cinder/volume/drivers/pure.py:539
-#, python-format
-msgid "Response not in JSON: %s"
-msgstr ""
-
-#: cinder/volume/drivers/pure.py:551
+#: cinder/volume/drivers/pure.py:545
 msgid ""
-"All REST API versions supported by this version of the Pure Storage iSCSI"
-" driver are unavailable on array."
+"PureISCSIDriver manage_existing cannot manage a volume connected to "
+"hosts. Please disconnect the volume from existing hosts before importing."
 msgstr ""
 
 #: cinder/volume/drivers/rbd.py:77
@@ -4221,26 +3930,26 @@ msgstr ""
 msgid "clone depth exceeds limit of %s"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:653
+#: cinder/volume/drivers/rbd.py:660
 msgid ""
 "ImageBusy error raised while deleting rbd volume. This may have been "
 "caused by a connection from a client that has crashed and, if so, may be "
 "resolved by retrying the delete after 30 seconds has elapsed."
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:762
+#: cinder/volume/drivers/rbd.py:769
 msgid "Not stored in rbd"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:766
+#: cinder/volume/drivers/rbd.py:773
 msgid "Blank components"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:769
+#: cinder/volume/drivers/rbd.py:776
 msgid "Not an rbd snapshot"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:907 cinder/volume/drivers/sheepdog.py:187
+#: cinder/volume/drivers/rbd.py:916 cinder/volume/drivers/sheepdog.py:188
 #, python-format
 msgid "Failed to Extend Volume %(volname)s"
 msgstr ""
@@ -4334,33 +4043,33 @@ msgstr ""
 msgid "Timed out while waiting for Nova update for deletion of snapshot %(id)s."
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:74
+#: cinder/volume/drivers/scality.py:75
 msgid "Value required for 'scality_sofs_config'"
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:85
+#: cinder/volume/drivers/scality.py:86
 #, python-format
 msgid "Cannot access 'scality_sofs_config': %s"
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:91
+#: cinder/volume/drivers/scality.py:92
 msgid "Cannot execute /sbin/mount.sofs"
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:112
+#: cinder/volume/drivers/scality.py:114
 msgid "Cannot mount Scality SOFS, check syslog for errors"
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:144
+#: cinder/volume/drivers/scality.py:146
 #, python-format
 msgid "Cannot find volume dir for Scality SOFS at '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:292
+#: cinder/volume/drivers/scality.py:300
 msgid "Backup is only supported for raw-formatted SOFS volumes."
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:297
+#: cinder/volume/drivers/scality.py:305
 msgid "Backup is only supported for SOFS volumes without backing file."
 msgstr ""
 
@@ -4432,33 +4141,42 @@ msgstr ""
 msgid " but size is now %d."
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:82
+#: cinder/volume/drivers/solidfire.py:95
 #, python-format
 msgid "Retry count exceeded for command: %s"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:181
-#: cinder/volume/drivers/solidfire.py:254
-#: cinder/volume/drivers/solidfire.py:349
+#: cinder/volume/drivers/solidfire.py:194
+#: cinder/volume/drivers/solidfire.py:267
+#: cinder/volume/drivers/solidfire.py:363
 #, python-format
 msgid "API response: %s"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:381
+#: cinder/volume/drivers/solidfire.py:395
 msgid "Failed to get model update from clone"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:393
+#: cinder/volume/drivers/solidfire.py:416
 #, python-format
 msgid "Failed volume create: %s"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:446
+#: cinder/volume/drivers/solidfire.py:469
 #, python-format
 msgid "Failed to get SolidFire Volume: %s"
 msgstr ""
 
-#: cinder/volume/drivers/solidfire.py:571
+#: cinder/volume/drivers/solidfire.py:596
+#, python-format
+msgid "Failed to delete SolidFire Image-Volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:603
+msgid "Failed to create SolidFire Image-Volume"
+msgstr ""
+
+#: cinder/volume/drivers/solidfire.py:748
 #, python-format
 msgid "Failed to delete SolidFire Volume: %s"
 msgstr ""
@@ -4622,45 +4340,45 @@ msgid ""
 "OpenStack volume [%s]."
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:207
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:208
 msgid "Failed to connect to Enterprise Manager"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:231
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:232
 msgid "Failed to find Storage Center"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:435
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:436
 #, python-format
 msgid "Error deleting volume %(ssn)s: %(sn)s: %(c)d %(r)s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:113
-msgid "unable to create volume"
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:114
+msgid "Unable to create volume"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:158
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:162
 #, python-format
 msgid "Failed to create snapshot %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:191
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:219
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:201
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:231
 #, python-format
 msgid "Failed to create volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:237
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:252
 #, python-format
 msgid "Failed to delete snapshot %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:267
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:283
 #, python-format
 msgid "unable to find volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_common.py:290
+#: cinder/volume/drivers/dell/dell_storagecenter_common.py:308
 #, python-format
 msgid "Unable to extend volume %s"
 msgstr ""
@@ -4726,102 +4444,109 @@ msgid ""
 " %(resultSize)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:789
+#: cinder/volume/drivers/emc/emc_vmax_common.py:791
 #, python-format
 msgid ""
 "Failed to return volume %(volumeName)s to original storage pool. Please "
 "contact your system administrator to return it to the correct location "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:879
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2051
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2424
+#: cinder/volume/drivers/emc/emc_vmax_common.py:881
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2034
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2430
 #, python-format
 msgid ""
 "Unable to create or get default storage group for FAST policy: "
 "%(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:892
+#: cinder/volume/drivers/emc/emc_vmax_common.py:894
 #, python-format
 msgid ""
 "Failed to verify that volume was added to storage group for FAST policy: "
 "%(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:933
+#: cinder/volume/drivers/emc/emc_vmax_common.py:935
 #, python-format
 msgid "Error finding targe pool instance name for pool: %(targetPoolName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:947
+#: cinder/volume/drivers/emc/emc_vmax_common.py:949
 #, python-format
 msgid ""
 "Error migrating volume: %(volumename)s. to target pool  "
 "%(targetPoolName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:962
+#: cinder/volume/drivers/emc/emc_vmax_common.py:964
 #, python-format
 msgid ""
 "Volume : %(volumeName)s. was not successfully migrated to target pool "
 "%(targetPoolName)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1005
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1007
 #, python-format
 msgid ""
 "Failed to remove: %(volumename)s. from the default storage group for FAST"
 " policy %(fastPolicyName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1015
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2116
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1017
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2099
 #, python-format
 msgid ""
 "The volume: %(volumename)s. was not first part of the default storage "
 "group for FAST policy %(fastPolicyName)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1173
-#, python-format
-msgid "StorageSystem %(array)s is not found."
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1154
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1219
+msgid "Cannot connect to ECOM server"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1210
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1187
 #, python-format
 msgid "Pool %(poolNameInStr)s is not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1216
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1193
 #, python-format
 msgid "Storage system not found for pool %(poolNameInStr)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1406
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1290
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:466
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1398
+#, python-format
+msgid "Error finding %s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1383
 #, python-format
 msgid "Unable to get target endpoints for hardwareId %(hardwareIdInstance)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1500
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1483
 #, python-format
 msgid "Configuration file %(configurationFile)s does not exist "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1549
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1532
 msgid ""
 "The pool cannot be null. The pool must be configured either in the extra "
 "specs or in the EMC configuration file corresponding to the Volume Type. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1560
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1543
 msgid ""
 "The array cannot be null. The pool must be configured either as a cinder "
 "extra spec for multi-backend or in the EMC configuration file for the "
 "default case "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1592
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1575
 msgid ""
 "Unable to get configuration information necessary to create a volume. "
 "Please check that there is a configuration file for each config group, if"
@@ -4829,53 +4554,61 @@ msgid ""
 "/etc/cinder/cinder_emc_config_<CONFIG_GROUP>.xml"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1615
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1598
 msgid "You must supply an array in your EMC configuration file "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1621
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1604
 msgid "Cannot get necessary pool or storage system information "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1701
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1684
 #, python-format
 msgid ""
 "Error adding Volume: %(volumeName)s.  with instance path: "
 "%(volumeInstancePath)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1713
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1696
 #, python-format
 msgid "Rolling back %(volumeName)s by deleting it. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1819
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1802
 #, python-format
 msgid "Unable to determine whether %(volumeName)s is composite or not "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1963
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1946
 msgid "Error Creating unbound volume."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1985
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1968
 #, python-format
 msgid "Error appending volume %(volumename)s to target base volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2166
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2149
 #, python-format
 msgid "Failed to delete volume %(volumeName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2360
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2265
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1601
+#, python-format
+msgid ""
+"Volume %(name)s not found on the array. Cannot determine if there are "
+"volumes mapped."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2366
 #, python-format
 msgid ""
 "The striped meta count of %(memberCount)s is too small for volume: "
 "%(volumeName)s. with size %(volumeSize)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2394
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2400
 #, python-format
 msgid ""
 "Pool: %(poolName)s. is not associated to storage tier for fast policy "
@@ -4895,7 +4628,7 @@ msgid "Cannot determine if Tiering Policies are supported"
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vmax_fast.py:118
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:610
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:617
 msgid "FAST is not supported on this array "
 msgstr ""
 
@@ -5002,50 +4735,45 @@ msgstr ""
 msgid "Failed to get or create masking view %(maskingViewName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:287
-#, python-format
-msgid "Found existing masking view: %(maskingViewName)s "
-msgstr ""
-
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:588
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:609
 #, python-format
 msgid ""
 "Error Create Masking View: %(groupName)s. Return code: %(rc)lu. Error: "
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:686
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:720
 #, python-format
 msgid "Cannot create or find an storage group with name %(sgGroupName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:722
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:756
 #, python-format
 msgid ""
 "Cannot find a portGroup with name %(pgGroupName)s. The port group for a "
 "masking view must be pre-defined"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:751
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:785
 #, python-format
 msgid "Cannot create or find an initiator group with name %(igGroupName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:779
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:813
 #, python-format
 msgid ""
 "Cannot find the new masking view just created with name "
 "%(maskingViewName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:812
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:846
 #, python-format
 msgid ""
 "Performing rollback on Volume: %(volumeName)s To return it to the default"
-" storage group for FAST policy %(fastPolicyName)s. "
+" storage group for FAST policy %(fastPolicyName)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:825
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:859
 #, python-format
 msgid ""
 "Failed to Roll back to re-add volume %(volumeName)s to default storage "
@@ -5053,12 +4781,12 @@ msgid ""
 "to get the volume re-added manually "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:834
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:868
 #, python-format
 msgid "The storage group found is %(foundStorageGroupInstanceName)s: "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:851
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:885
 #, python-format
 msgid ""
 "Rollback for Volume: %(volumeName)s has failed. Please contact your "
@@ -5066,7 +4794,7 @@ msgid ""
 "storage group for fast policy %(fastPolicyName)s failed "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1009
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1039
 #: cinder/volume/drivers/emc/emc_vmax_provision.py:134
 #: cinder/volume/drivers/emc/emc_vmax_provision.py:166
 #, python-format
@@ -5075,33 +4803,33 @@ msgid ""
 "%(error)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1032
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1062
 #, python-format
 msgid ""
 "Error adding initiator to group : %(groupName)s. Return code: %(rc)lu.  "
 "Error: %(error)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1095
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1119
 #, python-format
 msgid ""
 "Error Modifying masking view : %(groupName)s. Return code: %(rc)lu.  "
 "Error: %(error)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1147
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1171
 #, python-format
 msgid "Added volume: %(volumeName)s to existing storage group %(sgGroupName)s. "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1176
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1200
 #, python-format
 msgid ""
 "Volume %(volumeName)s was not first part of the default storage group for"
 " the FAST Policy"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1209
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1233
 #, python-format
 msgid ""
 "Failed to remove %(volumeName)s from the default storage group for the "
@@ -5231,17 +4959,32 @@ msgstr ""
 msgid "Tier Policy Service not found for %(storageSystemName)s"
 msgstr ""
 
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:309
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1429
+msgid "Issue encountered waiting for job."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:370
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1493
+msgid "Issue encountered waiting for synchronization."
+msgstr ""
+
 #: cinder/volume/drivers/emc/emc_vmax_utils.py:435
 msgid "Cannot get storage system"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:630
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:635
 msgid "Port Group name not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:1261
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:1270
 #, python-format
-msgid "Cannot verify the existance of object:%(instanceName)s."
+msgid "Cannot verify the existence of object:%(instanceName)s."
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:1295
+#, python-format
+msgid "StorageSystem %(array)s was not found."
 msgstr ""
 
 #: cinder/volume/drivers/emc/emc_vnx_cli.py:203
@@ -5436,6 +5179,238 @@ msgstr ""
 msgid "Failed to get targets"
 msgstr ""
 
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:184
+#, python-format
+msgid ""
+"Error Create Volume: %(volumename)s. Storage Configuration Service not "
+"found for pool %(storage_type)s."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:310
+#, 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/fujitsu/eternus_dx_common.py:350
+#, 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/fujitsu/eternus_dx_common.py:419
+#, 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/fujitsu/eternus_dx_common.py:459
+#, 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/fujitsu/eternus_dx_common.py:527
+#, python-format
+msgid ""
+"Error Delete Volume: %(volumename)s. Storage Configuration Service not "
+"found."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:556
+#, python-format
+msgid ""
+"Error Delete Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
+"%(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:598
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:727
+#, python-format
+msgid "Cannot find Replication Service to create snapshot for volume %s."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:642
+#, python-format
+msgid "Create Snapshot: %(snapshotname)s. Storage Configuration Service not found"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:665
+#, python-format
+msgid ""
+"Error Create Snapshot: %(snapshot)s Volume: %(volume)s Error: "
+"%(errordesc)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:759
+#, python-format
+msgid ""
+"Error Delete Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s. Return code: %(rc)lu. Error: %(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:862
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:881
+#, python-format
+msgid "Error mapping volume %(volumename)s.rc:%(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:886
+#, python-format
+msgid "Error mapping volume %(volumename)s:%(results)s."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:923
+#, python-format
+msgid "Error unmapping volume %(volumename)s.rc:%(rc)lu"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:943
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:969
+#, python-format
+msgid "Cannot find Controller Configuration Service for storage system %s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1033
+#, python-format
+msgid ""
+"Error Extend Volume: %(volumename)s. Storage Configuration Service not "
+"found."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1069
+#, python-format
+msgid ""
+"Error Extend Volume: %(volumename)s.  Return code: %(rc)lu.  Error: "
+"%(error)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1124
+msgid "Storage type not found."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1147
+msgid "Snap pool not found."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1301
+#, python-format
+msgid "Pool %(storage_type)s is not found."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1307
+#, python-format
+msgid "Storage system not found for pool %(storage_type)s."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1769
+msgid "_create_volume_name,id_code is None."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1804
+#, python-format
+msgid ""
+"_get_pool_instance_id,poolname:%(poolname)s,EnumerateInstances,cannot "
+"connect to ETERNUS."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1827
+#, python-format
+msgid "_get_pool_instance_id,poolname:%(poolname)s,poolinstanceid is None."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1853
+#, python-format
+msgid ""
+"get_target_portid,connector:%(connector)s,EnumerateInstances,cannot "
+"connect to ETERNUS."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1876
+#, python-format
+msgid ""
+"get_target_portid,protcol:%(protocol)s,connector:%(connector)s,target_portid"
+" does not found."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1915
+msgid "_find_copysession,Cannot find Replication Service to find copysession"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1936
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:2025
+#, python-format
+msgid ""
+"_find_copysession,source_volumename:%(volumename)s,Return "
+"code:%(rc)lu,Error:%(errordesc)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1956
+#, python-format
+msgid ""
+"_find_copysession,source_volumename:%(volumename)s,GetInstance,cannot "
+"connect to ETERNUS."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1979
+#, python-format
+msgid ""
+"_find_copy_session,source_volumename:%(volumename)s,wait for end of "
+"copysession"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1996
+#, python-format
+msgid ""
+"_find_copysession,source_volumename:%(volumename)s,copysession state is "
+"BROKEN"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:2047
+#, python-format
+msgid ""
+"_find_copysession,target_volumename:%(volumename)s,GetInstance,cannot "
+"connect to ETERNUS."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:2079
+#, python-format
+msgid "_find_copysession,volumename:%(volumename)s,not found."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:2103
+#, python-format
+msgid ""
+"_delete_copysession, copysession:%(cpsession)s,GetInstance,cannot connect"
+" to ETERNUS."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:2118
+msgid "_delete_copysession,Cannot find Replication Service to delete copysession"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:2147
+#, python-format
+msgid ""
+"_delete_copysession,copysession:%(cpsession)s,operation:%(operation)s,Return"
+" code:%(rc)lu,Error:%(errordesc)s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py:190
+#, python-format
+msgid "Could not find iSCSI export  for volume %s"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py:199
+#, python-format
+msgid "Cannot find device number for volume %s"
+msgstr ""
+
 #: cinder/volume/drivers/fusionio/ioControl.py:89
 msgid "FIO ioControl API version not supported"
 msgstr ""
@@ -5467,7 +5442,7 @@ msgstr ""
 #: cinder/volume/drivers/fusionio/ioControl.py:284
 #: cinder/volume/drivers/ibm/ibmnas.py:110
 #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:260
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:213
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:215
 #, python-format
 msgid "%s is not set"
 msgstr ""
@@ -5492,7 +5467,7 @@ msgid "portal: %(ip)s:%(ipp)s, CTL: %(ctl)s, port: %(port)s"
 msgstr ""
 
 #: cinder/volume/drivers/hds/nfs.py:228
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:495
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:493
 msgid "Resizing image file failed."
 msgstr ""
 
@@ -5808,10 +5783,6 @@ msgid ""
 " the iSCSI port IP %s is configured in array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_t.py:438
-msgid "validate_connector: The FC driver requires the wwpns in the connector."
-msgstr ""
-
 #: cinder/volume/drivers/huawei/rest_common.py:108
 #, python-format
 msgid "Login error, reason is: %s."
@@ -6157,11 +6128,6 @@ msgid ""
 "authentication: set either san_password or san_private_key option."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/flashsystem.py:1141
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:311
-msgid "The connector does not contain the required information."
-msgstr ""
-
 #: cinder/volume/drivers/ibm/flashsystem.py:1204
 #, python-format
 msgid "initialize_connection: vdisk %s is not defined."
@@ -6188,8 +6154,8 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/ibm/flashsystem.py:1339
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:625
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:748
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:626
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:749
 msgid "create_cloned_volume: Source and destination size differ."
 msgstr ""
 
@@ -6273,12 +6239,12 @@ msgid ""
 " level is %(cur)s, must be at least %(min)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/gpfs.py:953
+#: cinder/volume/drivers/ibm/gpfs.py:955
 #, python-format
 msgid "mkfs failed on volume %(vol)s, error message was: %(err)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/gpfs.py:986
+#: cinder/volume/drivers/ibm/gpfs.py:988
 #, python-format
 msgid ""
 "%s cannot be accessed. Verify that GPFS is active and file system is "
@@ -6345,109 +6311,109 @@ msgid ""
 "values are between 0 and 600"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:374
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:375
 #, python-format
 msgid "initialize_connection: Failed to get attributes for volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:388
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:389
 #, python-format
 msgid "initialize_connection: Missing volume attribute for volume %s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:405
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:406
 #, python-format
 msgid ""
 "initialize_connection: No node found in I/O group %(gid)s for volume "
 "%(vol)s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:446
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:447
 msgid ""
 "Could not get FC connection information for the host-volume connection. "
 "Is the host configured properly for FC connections?"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:536
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:537
 msgid "terminate_connection: Failed to get host name from connector."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:590
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:591
 msgid "create_snapshot: get source volume failed."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:603
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:604
 msgid "create_volume_from_snapshot: Source and destination size differ."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:650
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:651
 msgid "extend_volume: Extending a volume with snapshots is not supported."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:698
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:699
 #, python-format
 msgid ""
 "_rm_vdisk_copy_op: Volume %s does not have any registered vdisk copy "
 "operations."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:703
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:704
 #, python-format
 msgid ""
 "_rm_vdisk_copy_op: Volume %(vol)s does not have the specified vdisk copy "
 "operation: orig=%(orig)s new=%(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:715
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:716
 #, python-format
 msgid ""
 "_rm_vdisk_copy_op: Volume metadata %s does not have any registered vdisk "
 "copy operations."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:723
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:724
 #, python-format
 msgid ""
 "_rm_vdisk_copy_op: Volume %(vol)s metadata does not have the specified "
 "vdisk copy operation: orig=%(orig)s new=%(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:782
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:783
 #, python-format
 msgid ""
 "_check_volume_copy_ops: Volume %(vol)s does not have the specified vdisk "
 "copy operation: orig=%(orig)s new=%(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:898
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:899
 #, python-format
 msgid ""
 "Unable to retype: Current action needs volume-copy, it is not allowed "
 "when new type is replication. Volume = %s"
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:915
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:916
 #, python-format
 msgid ""
 "Unable to retype:  A copy of volume %s exists. Retyping would exceed the "
 "limit of 2 copies."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:955
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:982
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:956
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:983
 #, python-format
 msgid "No vdisk with the UID specified by source-id %s."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:975
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:976
 msgid "Reference must contain source-id element."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:991
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:992
 msgid "The specified vdisk is mapped to a host."
 msgstr ""
 
-#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1032
+#: cinder/volume/drivers/ibm/storwize_svc/__init__.py:1033
 msgid "_update_volume_stats: Could not get storage pool data"
 msgstr ""
 
@@ -6622,16 +6588,16 @@ msgid ""
 "%(row)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:69
+#: cinder/volume/drivers/netapp/common.py:70
 msgid "Required configuration not found"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:98
+#: cinder/volume/drivers/netapp/common.py:99
 #, python-format
 msgid "Storage family %s is not supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:104
+#: cinder/volume/drivers/netapp/common.py:105
 #, python-format
 msgid ""
 "Protocol %(storage_protocol)s is not supported for storage family "
@@ -6769,20 +6735,20 @@ msgstr ""
 msgid "NFS file %s not discovered."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:463
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:461
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:480
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:478
 msgid "NFS file could not be discovered."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:592
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:590
 msgid "Image location not present."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:630
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:628
 msgid "Container size smaller than required file size."
 msgstr ""
 
@@ -7275,156 +7241,156 @@ msgstr ""
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:222
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:224
 #, python-format
 msgid ""
 "Invalid hp3parclient version found (%(found)s). Version %(minimum)s or "
 "greater required."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:237
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:239
 #, python-format
 msgid "Failed to Login to 3PAR (%(url)s) because %(err)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:263
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:265
 msgid "You must install hp3parclient before using 3PAR drivers."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:289
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:679
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:291
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:690
 #, python-format
 msgid "CPG (%s) doesn't exist on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:297
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:299
 #, 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:332
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:433
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:334
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:444
 #, python-format
 msgid "Virtual volume '%s' doesn't exist on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:365
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:367
 #, python-format
 msgid "Volume type ID '%s' is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:424
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:435
 msgid "Reference must be for an unmanaged virtual volume."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:467
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:478
 msgid "Reference must contain source-name or source-id."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:720
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:731
 #, python-format
 msgid "3PAR vlun %(name)s not found on host %(host)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:743
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:754
 #, python-format
 msgid "3PAR vlun for volume %(name)s not found on host %(host)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:781
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:792
 #, python-format
 msgid ""
 "3PAR vlun for volume '%(name)s' was deleted, but the host '%(host)s' was "
 "not deleted because: %(reason)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:881
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:892
 #, python-format
 msgid "VV Set %s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:923
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:934
 #, 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:1008
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1019
 #, 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:1101
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1113
 #, python-format
 msgid "Volume (%s) already exists on array"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1243
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1255
 msgid ""
 "The volume is currently busy on the 3PAR and cannot be deleted at this "
 "time. You can try again later."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1255
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1267
 #, python-format
 msgid "Delete volume id not found. Removing from cinder: %(id)s Ex: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1406
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1419
 #, python-format
 msgid "Failure in update_volume_key_value_pair:%s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1420
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1436
 #, python-format
 msgid "Failure in clear_volume_key_value_pair:%s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1513
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1533
 #, python-format
 msgid ""
 "Copy volume task failed: convert_to_base_volume: id=%(id)s, "
 "status=%(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1537
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1557
 #, python-format
 msgid "Volume (%s) already exists on array."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1568
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1588
 #, python-format
 msgid "Delete Snapshot id not found. Removing from cinder: %(id)s Ex: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1668
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1704
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1688
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1724
 #, python-format
 msgid ""
 "Tune volume task stopped before it was done: volume_name=%(volume_name)s,"
 " task-status=%(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1727
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1747
 #, python-format
 msgid "Cannot retype from HP3PARDriver to %s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1733
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1753
 msgid "Cannot retype from one 3PAR array to another."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1739
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1759
 #, python-format
 msgid "Invalid new snapCPG name for retype.  new_snap_cpg='%s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1746
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1766
 msgid "Cannot retype to a CPG in a different domain."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1750
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1770
 msgid "Cannot retype to a snap CPG in a different domain."
 msgstr ""
 
@@ -7480,15 +7446,15 @@ msgstr ""
 msgid "local_path not supported"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:106
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:109
 msgid "HPLeftHand url not found"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:132
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:147
 msgid "LeftHand cluster not found"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:140
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:155
 #, python-format
 msgid "REST %(proxy_ver)s hplefthandclient %(rest_ver)s"
 msgstr ""
@@ -7607,8 +7573,8 @@ msgstr ""
 msgid "Error occurred while writing to image: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:206
-#: cinder/volume/drivers/vmware/read_write_util.py:299
+#: cinder/volume/drivers/vmware/read_write_util.py:199
+#: cinder/volume/drivers/vmware/read_write_util.py:292
 msgid "Could not retrieve URL from lease."
 msgstr ""
 
@@ -7727,7 +7693,7 @@ msgstr ""
 msgid "There are no valid datastores attached to %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1220
+#: cinder/volume/drivers/vmware/volumeops.py:1222
 #, python-format
 msgid "Invalid disk backing: %s."
 msgstr ""
@@ -8103,7 +8069,7 @@ msgid ""
 "Return code: %(ret.status)d Message: %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:464
+#: cinder/volume/drivers/zfssa/zfssarest.py:466
 #, python-format
 msgid ""
 "Error Setting Volume: %(lun)s to InitiatorGroup: %(initiatorgroup)s Pool:"
@@ -8111,21 +8077,21 @@ msgid ""
 "%(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:486
+#: cinder/volume/drivers/zfssa/zfssarest.py:488
 #, python-format
 msgid ""
 "Error Deleting Volume: %(lun)s to Pool: %(pool)s Project: %(project)s  "
 "Return code: %(ret.status)d Message: %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:509
+#: cinder/volume/drivers/zfssa/zfssarest.py:511
 #, python-format
 msgid ""
 "Error Creating Snapshot: %(snapshot)s onVolume: %(lun)s to Pool: %(pool)s"
 " Project: %(project)s  Return code: %(ret.status)d Message: %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:532
+#: cinder/volume/drivers/zfssa/zfssarest.py:534
 #, python-format
 msgid ""
 "Error Deleting Snapshot: %(snapshot)s on Volume: %(lun)s to Pool: "
@@ -8133,39 +8099,39 @@ msgid ""
 "%(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:560
+#: cinder/volume/drivers/zfssa/zfssarest.py:562
 #, python-format
 msgid ""
 "Error Cloning Snapshot: %(snapshot)s on Volume: %(lun)s of Pool: %(pool)s"
 " Project: %(project)s  Return code: %(ret.status)d Message: %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:585
+#: cinder/volume/drivers/zfssa/zfssarest.py:587
 #, python-format
 msgid ""
 "Error Setting props Props: %(props)s on Volume: %(lun)s of Pool: %(pool)s"
 " Project: %(project)s  Return code: %(ret.status)d Message: %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:608
+#: cinder/volume/drivers/zfssa/zfssarest.py:610
 #, python-format
 msgid ""
 "Error Getting Snapshot: %(snapshot)s on Volume: %(lun)s to Pool: %(pool)s"
 " Project: %(project)s  Return code: %(ret.status)d Message: %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:634
+#: cinder/volume/drivers/zfssa/zfssarest.py:636
 msgid "Error getting initiator groups."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:672
+#: cinder/volume/drivers/zfssa/zfssarest.py:674
 #, python-format
 msgid ""
 "Error Verifying share: %(share)s on Project: %(project)s and Pool: "
 "%(pool)s Return code: %(ret.status)d Message: %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:696
+#: cinder/volume/drivers/zfssa/zfssarest.py:698
 #, python-format
 msgid ""
 "Error Creating Snapshot: %(snapshot)s onshare: %(share)s to Pool: "
@@ -8173,7 +8139,7 @@ msgid ""
 "%(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:718
+#: cinder/volume/drivers/zfssa/zfssarest.py:720
 #, python-format
 msgid ""
 "Error Deleting Snapshot: %(snapshot)s on Share: %(share)s to Pool: "
@@ -8181,42 +8147,42 @@ msgid ""
 "%(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:751
-#: cinder/volume/drivers/zfssa/zfssarest.py:789
+#: cinder/volume/drivers/zfssa/zfssarest.py:753
+#: cinder/volume/drivers/zfssa/zfssarest.py:791
 #, python-format
 msgid ""
 "Error Verifying Service: %(service)s Return code: %(ret.status)d Message:"
 " %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:767
-#: cinder/volume/drivers/zfssa/zfssarest.py:803
+#: cinder/volume/drivers/zfssa/zfssarest.py:769
+#: cinder/volume/drivers/zfssa/zfssarest.py:805
 #, python-format
 msgid "%(service)s Service is not %(status)s on storage appliance: %(host)s"
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:821
+#: cinder/volume/drivers/zfssa/zfssarest.py:823
 #, python-format
 msgid ""
 "Error modifying Service: %(service)s Return code: %(ret.status)d Message:"
 " %(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:846
+#: cinder/volume/drivers/zfssa/zfssarest.py:848
 #, python-format
 msgid ""
 "Error Creating Share: %(name)s Return code: %(ret.status)d Message: "
 "%(ret.data)s."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:859
+#: cinder/volume/drivers/zfssa/zfssarest.py:861
 #, python-format
 msgid ""
 "Error editing share: %(share)s on Pool: %(pool)s Return code: "
 "%(ret.status)d Message: %(ret.data)s ."
 msgstr ""
 
-#: cinder/volume/drivers/zfssa/zfssarest.py:876
+#: cinder/volume/drivers/zfssa/zfssarest.py:878
 #, python-format
 msgid ""
 "Error Getting Share: %(share)s on Pool: %(pool)s Project: %(project)s "
@@ -8320,7 +8286,7 @@ msgid ""
 "%(src_type)s %(src_id)s metadata"
 msgstr ""
 
-#: cinder/volume/flows/manager/create_volume.py:700
+#: cinder/volume/flows/manager/create_volume.py:703
 #, python-format
 msgid "Volume %(volume_name)s (%(volume_id)s): created successfully"
 msgstr ""
@@ -8330,7 +8296,7 @@ msgstr ""
 msgid "Volume driver %s not initialized."
 msgstr ""
 
-#: cinder/volume/targets/lio.py:146 cinder/volume/targets/tgt.py:426
+#: cinder/volume/targets/lio.py:149 cinder/volume/targets/tgt.py:420
 msgid "valid iqn needed for show_target"
 msgstr ""
 
diff --git a/cinder/locale/de/LC_MESSAGES/cinder-log-info.po b/cinder/locale/de/LC_MESSAGES/cinder-log-info.po
index 0adbda1f4de..1c2a7c43271 100644
--- a/cinder/locale/de/LC_MESSAGES/cinder-log-info.po
+++ b/cinder/locale/de/LC_MESSAGES/cinder-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Cinder\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-01-15 06:08+0000\n"
-"PO-Revision-Date: 2015-01-15 04:15+0000\n"
+"POT-Creation-Date: 2015-01-30 06:25+0000\n"
+"PO-Revision-Date: 2015-01-30 00:04+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/cinder/language/"
 "de/)\n"
@@ -336,7 +336,7 @@ msgstr ""
 msgid "volume_file does not support fileno() so skippingfsync()"
 msgstr ""
 
-#: cinder/brick/local_dev/lvm.py:265
+#: cinder/brick/local_dev/lvm.py:267
 #, python-format
 msgid "'Not found' when querying LVM info. (vg_name=%(vg)s, lv_name=%(lv)s"
 msgstr ""
@@ -372,13 +372,6 @@ msgstr ""
 msgid "Skipping periodic task %(task)s because it is disabled"
 msgstr "Überspringe periodische Aufgabe %(task)s weil sie deaktiviert ist"
 
-#: cinder/openstack/common/request_utils.py:79
-#, python-format
-msgid ""
-"Request ID Link: %(event_name)s '%(source_id)s'%(arrow)s%(target_name)s"
-"%(target_id)s"
-msgstr ""
-
 #: cinder/openstack/common/service.py:174
 #, python-format
 msgid "Caught %s, exiting"
@@ -432,7 +425,7 @@ msgstr "Warten aufgerufen nach dem der Thread abgebrochen wurde. Bereinige."
 msgid "Waiting on %d children to exit"
 msgstr "Warten auf Beenden von %d untergeordneten Elementen"
 
-#: cinder/scheduler/host_manager.py:466
+#: cinder/scheduler/host_manager.py:480
 #, python-format
 msgid "Removing non-active host: %(host)s from scheduler cache."
 msgstr ""
@@ -472,133 +465,171 @@ msgstr ""
 msgid "Volume %s has been transferred."
 msgstr "Volumen %s wurde übertragen."
 
-#: cinder/volume/manager.py:261
+#: cinder/volume/api.py:285
+#, python-format
+msgid "Unable to delete volume: %s, volume is attached."
+msgstr ""
+
+#: cinder/volume/api.py:294
+#, python-format
+msgid ""
+"Unable to delete volume: %(vol_id)s, volume must be available or error, but "
+"is %(vol_status)s."
+msgstr ""
+
+#: cinder/volume/api.py:303
+#, python-format
+msgid "Unable to delete volume: %s, volume is currently migrating."
+msgstr ""
+
+#: cinder/volume/api.py:310
+#, python-format
+msgid ""
+"Unable to delete volume: %s, volume is currently part of a consistency group."
+msgstr ""
+
+#: cinder/volume/api.py:317
+#, python-format
+msgid "Unable to delete volume: %s, volume currently has snapshots."
+msgstr ""
+
+#: cinder/volume/api.py:334
+#, python-format
+msgid "Succesfully issued request to delete volume: %s"
+msgstr ""
+
+#: cinder/volume/api.py:803
+#, python-format
+msgid "Succesfully issued request to delete snapshot: %s"
+msgstr ""
+
+#: cinder/volume/manager.py:265
 msgid "Determined volume DB was empty at startup."
 msgstr ""
 
-#: cinder/volume/manager.py:264
+#: cinder/volume/manager.py:268
 msgid "Determined volume DB was not empty at startup."
 msgstr ""
 
-#: cinder/volume/manager.py:271
+#: cinder/volume/manager.py:275
 #, python-format
 msgid "Starting volume driver %(driver_name)s (%(version)s)"
 msgstr ""
 
-#: cinder/volume/manager.py:310
+#: cinder/volume/manager.py:314
 #, python-format
 msgid "volume %s stuck in a downloading state"
 msgstr ""
 
-#: cinder/volume/manager.py:317
+#: cinder/volume/manager.py:321
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "Datenträger %s: Export wird übersprungen"
 
-#: cinder/volume/manager.py:332
+#: cinder/volume/manager.py:336
 #, python-format
 msgid "Resuming delete on volume: %s"
 msgstr "Fortsetzen von Löschen auf Datenträger: %s"
 
-#: cinder/volume/manager.py:438
+#: cinder/volume/manager.py:442
 #, python-format
 msgid "Tried to delete volume %s, but it no longer exists, moving on"
 msgstr ""
 
-#: cinder/volume/manager.py:447
+#: cinder/volume/manager.py:451
 #, python-format
 msgid "volume %s: deleting"
 msgstr "Volume %s: wird entfernt"
 
-#: cinder/volume/manager.py:503
+#: cinder/volume/manager.py:507
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "Volume %s: erfolgreich entfernt"
 
-#: cinder/volume/manager.py:533
+#: cinder/volume/manager.py:537
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "Momentaufnahme %s: Erstellung läuft"
 
-#: cinder/volume/manager.py:583
+#: cinder/volume/manager.py:587
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "Momentaufnahme %s: erfolgreich erstellt"
 
-#: cinder/volume/manager.py:595
+#: cinder/volume/manager.py:599
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "Momentaufnahme %s: wird gelöscht"
 
-#: cinder/volume/manager.py:646
+#: cinder/volume/manager.py:650
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "Momentaufnahme %s: erfolgreich gelöscht"
 
-#: cinder/volume/manager.py:1226
+#: cinder/volume/manager.py:1232
 msgid "Updating volume status"
 msgstr "Aktualisierung von Datenträgerstatus"
 
-#: cinder/volume/manager.py:1270
+#: cinder/volume/manager.py:1276
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Benachrichtigung {%s} erhalten"
 
-#: cinder/volume/manager.py:1338
+#: cinder/volume/manager.py:1344
 #, python-format
 msgid "volume %s: extending"
 msgstr ""
 
-#: cinder/volume/manager.py:1340
+#: cinder/volume/manager.py:1346
 #, python-format
 msgid "volume %s: extended successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1453
+#: cinder/volume/manager.py:1459
 #, python-format
 msgid "Volume %s: retyped successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1614
+#: cinder/volume/manager.py:1620
 msgid "Updating volume replication status."
 msgstr ""
 
-#: cinder/volume/manager.py:1658
+#: cinder/volume/manager.py:1664
 #, python-format
 msgid "Consistency group %s: creating"
 msgstr ""
 
-#: cinder/volume/manager.py:1680
+#: cinder/volume/manager.py:1686
 #, python-format
 msgid "Consistency group %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1699
+#: cinder/volume/manager.py:1705
 #, python-format
 msgid "Consistency group %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1799
+#: cinder/volume/manager.py:1805
 #, python-format
 msgid "Consistency group %s: deleted successfully."
 msgstr ""
 
-#: cinder/volume/manager.py:1812
+#: cinder/volume/manager.py:1818
 #, python-format
 msgid "Cgsnapshot %s: creating."
 msgstr ""
 
-#: cinder/volume/manager.py:1887
+#: cinder/volume/manager.py:1893
 #, python-format
 msgid "cgsnapshot %s: created successfully"
 msgstr ""
 
-#: cinder/volume/manager.py:1900
+#: cinder/volume/manager.py:1906
 #, python-format
 msgid "cgsnapshot %s: deleting"
 msgstr ""
 
-#: cinder/volume/manager.py:1980
+#: cinder/volume/manager.py:1986
 #, python-format
 msgid "cgsnapshot %s: deleted successfully"
 msgstr ""
@@ -613,122 +644,22 @@ msgstr "Ausführen von sicherem Löschvorgang auf Datenträger: %s"
 msgid "Elapsed time for clear volume: %.2f sec"
 msgstr ""
 
-#: cinder/volume/drivers/block_device.py:106 cinder/volume/drivers/lvm.py:360
+#: cinder/volume/drivers/block_device.py:106 cinder/volume/drivers/lvm.py:368
 #: cinder/volume/drivers/srb.py:715 cinder/volume/drivers/nexenta/nfs.py:192
 #, python-format
 msgid "Creating clone of volume: %s"
 msgstr "Erstellung von Klon von Datenträger: %s"
 
-#: cinder/volume/drivers/eqlx.py:209
+#: cinder/volume/drivers/eqlx.py:218
 #, python-format
 msgid "EQL-driver: executing \"%s\"."
 msgstr "EQL-Treiber: \"%s\" wird ausgeführt."
 
-#: cinder/volume/drivers/eqlx.py:339
+#: cinder/volume/drivers/eqlx.py:350
 #, python-format
 msgid "EQL-driver: Setup is complete, group IP is \"%s\"."
 msgstr ""
 
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:160
-#, python-format
-msgid "Create Volume: %(volume)s  Size: %(size)lu"
-msgstr "Datenträger erstellen: %(volume)s  Größe: %(size)lu"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:290
-#, python-format
-msgid ""
-"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
-"%(snapshotname)s"
-msgstr ""
-"Datenträger von Momentaufnahme erstellen: Datenträger: %(volumename)s  "
-"Momentaufnahme: %(snapshotname)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:399
-#, python-format
-msgid ""
-"Create a Clone from Volume: Volume: %(volumename)s  Source Volume: "
-"%(srcname)s"
-msgstr ""
-"Klon von Datenträger erstellen: Datenträger: %(volumename)s  "
-"Quellendatenträger: %(srcname)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:503
-#, python-format
-msgid "Delete Volume: %(volume)s"
-msgstr "Datenträger löschen: %(volume)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:577
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863
-#, python-format
-msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
-msgstr "Momentaufnahme erstellen: %(snapshot)s: Datenträger: %(volume)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:705
-#, python-format
-msgid "Delete Snapshot: %(snapshot)s: volume: %(volume)s"
-msgstr "Momentaufnahme löschen: %(snapshot)s: Datenträger: %(volume)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:786
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:800
-#, python-format
-msgid "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot is deleted."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:934
-#, python-format
-msgid "Map volume: %(volume)s"
-msgstr "Datenträger zuordnen: %(volume)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:953
-#: cinder/volume/drivers/emc/emc_vmax_common.py:223
-#, python-format
-msgid "Unmap volume: %(volume)s"
-msgstr "Zuordnung von Datenträger aufheben: %(volume)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:959
-#: cinder/volume/drivers/emc/emc_vmax_common.py:229
-#, python-format
-msgid "Volume %s is not mapped. No volume to unmap."
-msgstr ""
-"Datenträger %s ist nicht zugeordnet. Kein Datenträger, dessen Zuordnung "
-"aufgehoben werden muss."
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:978
-#: cinder/volume/drivers/emc/emc_vmax_common.py:276
-#, python-format
-msgid "Initialize connection: %(volume)s"
-msgstr "Verbindung initialisieren: %(volume)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:984
-#, python-format
-msgid "Volume %s is already mapped."
-msgstr "Datenträger %s ist bereits zugeordnet."
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:996
-#: cinder/volume/drivers/emc/emc_vmax_common.py:383
-#, python-format
-msgid "Terminate connection: %(volume)s"
-msgstr "Verbindung beenden: %(volume)s"
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1013
-#, python-format
-msgid "Extend Volume: %(volume)s  New size: %(size)lu"
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1356
-#, python-format
-msgid ""
-"Snapshot Volume %(snapshotname)s, Source Volume %(volumename)s not found on "
-"the array."
-msgstr ""
-
-#: cinder/volume/drivers/fujitsu_eternus_dx_common.py:1672
-#, python-format
-msgid "Device number not found for volume %(volumename)s %(vol_instance)s."
-msgstr ""
-"Einheitennummer für Datenträger %(volumename)s %(vol_instance)s nicht "
-"gefunden."
-
 #: cinder/volume/drivers/glusterfs.py:173
 #, python-format
 msgid "%s is already umounted"
@@ -741,8 +672,18 @@ msgstr "%s ist bereits ausgehängt"
 msgid "casted to %s"
 msgstr "Cast auf %s"
 
+#: cinder/volume/drivers/lvm.py:316
+#, python-format
+msgid "Succesfully deleted volume: %s"
+msgstr ""
+
+#: cinder/volume/drivers/lvm.py:331
+#, python-format
+msgid "Succesfully deleted snapshot: %s"
+msgstr ""
+
 #: cinder/volume/drivers/nfs.py:281 cinder/volume/drivers/smbfs.py:407
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:617
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:615
 #, python-format
 msgid "Extending volume %s."
 msgstr ""
@@ -924,26 +865,31 @@ msgstr ""
 msgid "Deleting deleteInitiatorGrp %s "
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:270
+#: cinder/volume/drivers/pure.py:283
 #, python-format
 msgid "Using port %(name)s on the array at %(portal)s for iSCSI connectivity."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:284
+#: cinder/volume/drivers/pure.py:297
 #, python-format
 msgid "Re-using existing purity host %(host_name)r"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:289
+#: cinder/volume/drivers/pure.py:302
 #, python-format
 msgid "Creating host object %(host_name)r with IQN: %(iqn)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:349
+#: cinder/volume/drivers/pure.py:363
 #, python-format
 msgid "Deleting unneeded host %(host_name)r."
 msgstr ""
 
+#: cinder/volume/drivers/pure.py:550 cinder/volume/drivers/pure.py:578
+#, python-format
+msgid "Renaming existing volume %(ref_name)s to %(new_name)s"
+msgstr ""
+
 #: cinder/volume/drivers/quobyte.py:389
 #, python-format
 msgid "Fixing previous mount %s which was not unmounted correctly."
@@ -959,12 +905,12 @@ msgstr ""
 msgid "Mounting volume: %s succeeded"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:617
+#: cinder/volume/drivers/rbd.py:624
 #, python-format
 msgid "volume %s no longer exists in backend"
 msgstr ""
 
-#: cinder/volume/drivers/rbd.py:663
+#: cinder/volume/drivers/rbd.py:670
 #, python-format
 msgid "RBD volume %s not found, allowing delete operation to proceed."
 msgstr ""
@@ -994,16 +940,23 @@ msgid ""
 "Snapshot record for %s is not present, allowing snapshot_delete to proceed."
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:288
+#: cinder/volume/drivers/scality.py:296
 #, python-format
 msgid "Begin backup of volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/scality.py:307
+#: cinder/volume/drivers/scality.py:315
 #, python-format
 msgid "Restoring backup %(backup)s to volume %(volume)s."
 msgstr ""
 
+#: cinder/volume/drivers/solidfire.py:625
+#, python-format
+msgid ""
+"Unable to create cache volume because image: %s does not include properties."
+"virtual_size"
+msgstr ""
+
 #: cinder/volume/drivers/srb.py:340
 msgid "Error creating Volume"
 msgstr ""
@@ -1116,7 +1069,7 @@ msgid ""
 "[%(cb_vol)s] and parent OpenStack volume [%(stack_vol)s]."
 msgstr ""
 
-#: cinder/volume/drivers/dell/dell_storagecenter_api.py:398
+#: cinder/volume/drivers/dell/dell_storagecenter_api.py:399
 #, python-format
 msgid "Created volume %(index)d: %(name)s"
 msgstr ""
@@ -1151,13 +1104,39 @@ msgstr "Belassen von delete_volume: %(volumename)s  Rückgabecode: %(rc)lu"
 msgid "Delete Snapshot: %(snapshotName)s "
 msgstr "Momentaufnahme löschen: %(snapshotName)s "
 
+#: cinder/volume/drivers/emc/emc_vmax_common.py:223
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:953
+#, python-format
+msgid "Unmap volume: %(volume)s"
+msgstr "Zuordnung von Datenträger aufheben: %(volume)s"
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:229
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:959
+#, python-format
+msgid "Volume %s is not mapped. No volume to unmap."
+msgstr ""
+"Datenträger %s ist nicht zugeordnet. Kein Datenträger, dessen Zuordnung "
+"aufgehoben werden muss."
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:276
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:978
+#, python-format
+msgid "Initialize connection: %(volume)s"
+msgstr "Verbindung initialisieren: %(volume)s"
+
 #: cinder/volume/drivers/emc/emc_vmax_common.py:286
 #, python-format
 msgid ""
 "Volume %(volume)s is already mapped. The device number is %(deviceNumber)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:577
+#: cinder/volume/drivers/emc/emc_vmax_common.py:383
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:996
+#, python-format
+msgid "Terminate connection: %(volume)s"
+msgstr "Verbindung beenden: %(volume)s"
+
+#: cinder/volume/drivers/emc/emc_vmax_common.py:579
 #, python-format
 msgid ""
 "FAST: capacity stats for policy %(fastPolicyName)s on array %(arrayName)s "
@@ -1165,7 +1144,7 @@ msgid ""
 "%(free_capacity_gb)lu"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:588
+#: cinder/volume/drivers/emc/emc_vmax_common.py:590
 #, python-format
 msgid ""
 "NON-FAST: capacity stats for pool %(poolName)s on array %(arrayName)s "
@@ -1173,48 +1152,48 @@ msgid ""
 "%(free_capacity_gb)lu"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:639
+#: cinder/volume/drivers/emc/emc_vmax_common.py:641
 #, python-format
 msgid "Migrating using retype Volume: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:865
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2415
+#: cinder/volume/drivers/emc/emc_vmax_common.py:867
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2421
 #, python-format
 msgid ""
 "Adding volume: %(volumeName)s to default storage group for FAST policy: "
 "%(fastPolicyName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1109
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1111
 #, python-format
 msgid "Volume status is: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1137
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1139
 #, python-format
 msgid "configGroup of current host: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1868
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1851
 #, python-format
 msgid ""
 "Create a Clone from Volume: Clone Volume: %(cloneName)s Source Volume: "
 "%(sourceName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:1947
+#: cinder/volume/drivers/emc/emc_vmax_common.py:1930
 #, python-format
 msgid ""
 "Base target volume %(targetVol)s created. Capacity in bits: %(capInBits)lu "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_common.py:2307
+#: cinder/volume/drivers/emc/emc_vmax_common.py:2313
 #, python-format
 msgid "Target wwns in masking view %(maskingView)s: %(targetWwns)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_fast.py:587
+#: cinder/volume/drivers/emc/emc_vmax_fast.py:594
 #, python-format
 msgid "Storage group not associated with the policy %s"
 msgstr ""
@@ -1273,42 +1252,47 @@ msgstr "AUTH-Eigenschaften: %(authProps)s"
 msgid "AUTH properties: %s"
 msgstr "AUTH-Eigenschaften: %s"
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:328
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:298
+#, python-format
+msgid "Found existing masking view: %(maskingViewName)s "
+msgstr ""
+
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:339
 #, python-format
 msgid "Created new storage group: %(storageGroupName)s "
 msgstr "Neue Speichergruppe erstellt: %(storageGroupName)s "
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:425
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:440
 #, python-format
 msgid "Created new initiator group name: %(igGroupName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:428
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:443
 #, python-format
 msgid "Using existing initiator group name: %(igGroupName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:598
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:619
 #, python-format
 msgid "Created new masking view : %(maskingViewName)s "
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:729
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:763
 #, python-format
 msgid "Port group instance name is %(foundPortGroupInstanceName)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_masking.py:1320
+#: cinder/volume/drivers/emc/emc_vmax_masking.py:1344
 #, python-format
 msgid ""
 "policy:%(policy)s, policy service:%(service)s, masking group=%(maskingGroup)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:672
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:677
 msgid "Fast Policy not found."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vmax_utils.py:1195
+#: cinder/volume/drivers/emc/emc_vmax_utils.py:1204
 #, python-format
 msgid "Volume  %(volume)s does not have meta device members."
 msgstr ""
@@ -1361,6 +1345,12 @@ msgid ""
 "%(provisioning)s tiering: %(tiering)s."
 msgstr ""
 
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1863
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:577
+#, python-format
+msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
+msgstr "Momentaufnahme erstellen: %(snapshot)s: Datenträger: %(volume)s"
+
 #: cinder/volume/drivers/emc/emc_vnx_cli.py:1875
 #, python-format
 msgid "Delete Snapshot: %(snapshot)s"
@@ -1441,81 +1431,189 @@ msgstr ""
 msgid "initiator has no password while using chap,removing it"
 msgstr ""
 
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:160
+#, python-format
+msgid "Create Volume: %(volume)s  Size: %(size)lu"
+msgstr "Datenträger erstellen: %(volume)s  Größe: %(size)lu"
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:290
+#, python-format
+msgid ""
+"Create Volume from Snapshot: Volume: %(volumename)s  Snapshot: "
+"%(snapshotname)s"
+msgstr ""
+"Datenträger von Momentaufnahme erstellen: Datenträger: %(volumename)s  "
+"Momentaufnahme: %(snapshotname)s"
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:399
+#, python-format
+msgid ""
+"Create a Clone from Volume: Volume: %(volumename)s  Source Volume: "
+"%(srcname)s"
+msgstr ""
+"Klon von Datenträger erstellen: Datenträger: %(volumename)s  "
+"Quellendatenträger: %(srcname)s"
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:503
+#, python-format
+msgid "Delete Volume: %(volume)s"
+msgstr "Datenträger löschen: %(volume)s"
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:705
+#, python-format
+msgid "Delete Snapshot: %(snapshot)s: volume: %(volume)s"
+msgstr "Momentaufnahme löschen: %(snapshot)s: Datenträger: %(volume)s"
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:786
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:800
+#, python-format
+msgid "Snapshot: %(snapshot)s: volume: %(volume)s. Snapshot is deleted."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:934
+#, python-format
+msgid "Map volume: %(volume)s"
+msgstr "Datenträger zuordnen: %(volume)s"
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:984
+#, python-format
+msgid "Volume %s is already mapped."
+msgstr "Datenträger %s ist bereits zugeordnet."
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1013
+#, python-format
+msgid "Extend Volume: %(volume)s  New size: %(size)lu"
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1356
+#, python-format
+msgid ""
+"Snapshot Volume %(snapshotname)s, Source Volume %(volumename)s not found on "
+"the array."
+msgstr ""
+
+#: cinder/volume/drivers/fujitsu/eternus_dx_common.py:1672
+#, python-format
+msgid "Device number not found for volume %(volumename)s %(vol_instance)s."
+msgstr ""
+"Einheitennummer für Datenträger %(volumename)s %(vol_instance)s nicht "
+"gefunden."
+
 #: cinder/volume/drivers/hds/hds.py:95 cinder/volume/drivers/hds/iscsi.py:73
 #: cinder/volume/drivers/hds/nfs.py:62
 #, python-format
 msgid "%(element)s: %(val)s"
 msgstr "%(element)s: %(val)s"
 
-#: cinder/volume/drivers/hds/hds.py:108 cinder/volume/drivers/hds/iscsi.py:87
-#: cinder/volume/drivers/hds/nfs.py:75
+#: cinder/volume/drivers/hds/hds.py:108 cinder/volume/drivers/hds/iscsi.py:84
+#: cinder/volume/drivers/hds/nfs.py:73
 #, python-format
 msgid "XML exception reading parameter: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:148
+#: cinder/volume/drivers/hds/iscsi.py:57
+#, python-format
+msgid "Parse_loc: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:149
 #, python-format
 msgid "Backend type: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:206
+#: cinder/volume/drivers/hds/iscsi.py:203
 #, python-format
 msgid "Using default: instead of %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:207
-#: cinder/volume/drivers/hds/iscsi.py:270 cinder/volume/drivers/hds/nfs.py:194
+#: cinder/volume/drivers/hds/iscsi.py:204
+#: cinder/volume/drivers/hds/iscsi.py:266 cinder/volume/drivers/hds/nfs.py:193
 #, python-format
 msgid "Available services: %s"
 msgstr "Verfügbare Dienste: %s"
 
-#: cinder/volume/drivers/hds/iscsi.py:219
+#: cinder/volume/drivers/hds/iscsi.py:216
 #, python-format
 msgid "Retrieving secret for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:253
+#: cinder/volume/drivers/hds/iscsi.py:235
+#, python-format
+msgid "Set tgt CHAP secret for service: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:249
 #, python-format
 msgid "Retrieving target for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:312
+#: cinder/volume/drivers/hds/iscsi.py:293
+#, python-format
+msgid "stats: total: %(cap)d used: %(used)d"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:308
 #, python-format
 msgid "stats: stats: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:335
+#: cinder/volume/drivers/hds/iscsi.py:331
 #, python-format
 msgid "HDP list: %s"
 msgstr "HDP-Liste: %s"
 
-#: cinder/volume/drivers/hds/iscsi.py:386
+#: cinder/volume/drivers/hds/iscsi.py:382
 #, python-format
 msgid "do_setup: %s"
 msgstr "do_setup: %s"
 
-#: cinder/volume/drivers/hds/iscsi.py:390
+#: cinder/volume/drivers/hds/iscsi.py:386
 #, python-format
 msgid "iSCSI portal found for service: %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:444
+#: cinder/volume/drivers/hds/iscsi.py:439
 #, python-format
 msgid "create_volume: create_lu returns %s"
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:450
+#: cinder/volume/drivers/hds/iscsi.py:445
 #, python-format
 msgid "LUN %(lun)s of size %(sz)s MB is created."
 msgstr ""
 
-#: cinder/volume/drivers/hds/iscsi.py:501
+#: cinder/volume/drivers/hds/iscsi.py:495
 #, python-format
 msgid "LUN %(lun)s extended to %(size)s GB."
 msgstr "LUN %(lun)s erweitert auf %(size)s GB."
 
+#: cinder/volume/drivers/hds/iscsi.py:510
+#, python-format
+msgid "delete lun loc %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:538
+#, python-format
+msgid "initialize volume %(vol)s connector %(conn)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:567
+#, python-format
+msgid "initiate: connection %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/iscsi.py:598
+#, python-format
+msgid "terminate: connection %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:189
+#, python-format
+msgid "Get service: %(lbl)s->%(svc)s"
+msgstr ""
+
 #: cinder/volume/drivers/hds/nfs.py:220
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:488
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:486
 #, python-format
 msgid "Resizing file to %sG"
 msgstr ""
@@ -1525,6 +1623,32 @@ msgstr ""
 msgid "LUN %(id)s extended to %(size)s GB."
 msgstr "LUN %(id)s erweitert auf %(size)s GB."
 
+#: cinder/volume/drivers/hds/nfs.py:442
+#, python-format
+msgid "Review shares: %s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:449
+#, python-format
+msgid "share: %(share)s -> %(info)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:461
+#, python-format
+msgid "Save service info for %(svc)s -> %(hdp)s, %(path)s"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:473
+#, python-format
+msgid "share: %s incorrect entry"
+msgstr ""
+
+#: cinder/volume/drivers/hds/nfs.py:485
+#, python-format
+msgid ""
+"Cloning with volume_name %(vname)s clone_name %(cname)s export_path %(epath)s"
+msgstr ""
+
 #: cinder/volume/drivers/huawei/__init__.py:68
 #, python-format
 msgid ""
@@ -1736,17 +1860,17 @@ msgstr ""
 msgid "Tried to delete non-existant vdisk %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:75
+#: cinder/volume/drivers/netapp/common.py:76
 #, python-format
 msgid "OpenStack OS Version Info: %(info)s"
 msgstr "OpenStack OS Versionsinformation: %(info)s"
 
-#: cinder/volume/drivers/netapp/common.py:92
+#: cinder/volume/drivers/netapp/common.py:93
 #, python-format
 msgid "Requested unified config: %(storage_family)s and %(storage_protocol)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/common.py:110
+#: cinder/volume/drivers/netapp/common.py:111
 #, python-format
 msgid ""
 "NetApp driver of family %(storage_family)s and protocol %(storage_protocol)s "
@@ -1818,27 +1942,27 @@ msgstr ""
 msgid "Cleaning cache for share %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:397
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:395
 #, python-format
 msgid "Image cloning unsuccessful for image %(image_id)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:413
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:411
 #, python-format
 msgid "Cloning image %s from cache"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:433
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:431
 #, python-format
 msgid "Checking image clone %s from glance share."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:455
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:453
 #, python-format
 msgid "Image will locally be converted to raw %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:473
+#: cinder/volume/drivers/netapp/dataontap/nfs_base.py:471
 #, python-format
 msgid "Performing post clone for %s"
 msgstr ""
@@ -2087,133 +2211,140 @@ msgstr ""
 msgid "Activate Flexvisor cinder volume driver."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:257
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
 #, python-format
 msgid "Disconnect from 3PAR REST and SSH %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:259
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:261
 #, python-format
 msgid "logout Done %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:269
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:271
 #, python-format
 msgid "HP3PARCommon %(common_ver)s, hp3parclient %(rest_ver)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:374
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:377
+#, python-format
+msgid ""
+"Virtual volume %(disp)s '%(new)s' snapCPG is empty so it will be set to: "
+"%(cpg)s"
+msgstr ""
+
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:385
 #, python-format
 msgid "Virtual volume '%(ref)s' renamed to '%(new)s'."
 msgstr "Virtuelles Volumen '%(ref)s' umbenannt in '%(new)s'."
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:380
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:391
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is being retyped."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:387
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:398
 #, python-format
 msgid "Virtual volume %(disp)s successfully retyped to %(new_type)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:406
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:417
 #, python-format
 msgid "Virtual volume %(disp)s '%(new)s' is now being managed."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:448
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:459
 #, python-format
 msgid ""
 "Virtual volume %(disp)s '%(vol)s' is no longer managed. Volume renamed to "
 "'%(new)s'."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1469
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1486
 #, python-format
 msgid "3PAR driver cannot perform migration. Retype exception: %s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1534
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1554
 #, python-format
 msgid "Completed: convert_to_base_volume: id=%s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1655
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1675
 #, python-format
 msgid "Modifying %(volume_name)s userCPG from %(old_cpg)s to %(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1676
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1696
 #, python-format
 msgid ""
 "Converting %(volume_name)s to full provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1681
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1701
 #, python-format
 msgid ""
 "Converting %(volume_name)s to thin provisioning with userCPG=%(new_cpg)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1697
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1717
 #, python-format
 msgid "tunevv failed because the volume '%s' has snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1974
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:1994
 #, python-format
 msgid ""
 "Modifying %(volume_name)s snap_cpg from %(old_snap_cpg)s to %(new_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1985
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2005
 #, python-format
 msgid "Modifying %s comments."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_3par_common.py:1994
+#: cinder/volume/drivers/san/hp/hp_3par_common.py:2014
 #, python-format
 msgid ""
 "Retype revert %(volume_name)s snap_cpg from %(new_snap_cpg)s back to "
 "%(old_snap_cpg)s."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:80
+#: cinder/volume/drivers/san/hp/hp_lefthand_iscsi.py:79
 #, python-format
 msgid "HPLeftHand driver %(driver_ver)s, proxy %(proxy_ver)s"
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:501
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:561
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because volume is "
 "from a different backend."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:506
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:512
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:566
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:572
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because cluster "
 "exists in different management group."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:523
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:586
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because the volume "
 "has been exported."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:534
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:597
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because the volume "
 "has snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:542
+#: cinder/volume/drivers/san/hp/hp_lefthand_rest_proxy.py:605
 #, python-format
 msgid ""
 "Cannot provide backend assisted migration for volume: %s because volume does "
@@ -2240,12 +2371,12 @@ msgstr ""
 msgid "Successfully established connection to the server."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:209
+#: cinder/volume/drivers/vmware/read_write_util.py:202
 #, python-format
 msgid "Opening vmdk url: %s for write."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/read_write_util.py:302
+#: cinder/volume/drivers/vmware/read_write_util.py:295
 #, python-format
 msgid "Opening vmdk url: %s for read."
 msgstr ""
@@ -2381,7 +2512,7 @@ msgid "Relocating volume: %(backing)s to %(ds)s and %(rp)s."
 msgstr ""
 
 #: cinder/volume/drivers/vmware/vmdk.py:2006
-#: cinder/volume/drivers/vmware/volumeops.py:1066
+#: cinder/volume/drivers/vmware/volumeops.py:1068
 #, python-format
 msgid "Successfully created clone: %s."
 msgstr "Erfolgreich erstellter Klon: %s."
@@ -2416,68 +2547,68 @@ msgstr ""
 msgid "Deleted the VM backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:571
+#: cinder/volume/drivers/vmware/volumeops.py:573
 #, python-format
 msgid "Successfully extended the volume %(name)s to %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:716
+#: cinder/volume/drivers/vmware/volumeops.py:718
 #, python-format
 msgid "Successfully created volume backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:874
+#: cinder/volume/drivers/vmware/volumeops.py:876
 #, 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:892
+#: cinder/volume/drivers/vmware/volumeops.py:894
 #, python-format
 msgid ""
 "Successfully moved volume backing: %(backing)s into the folder: %(fol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:916
+#: cinder/volume/drivers/vmware/volumeops.py:918
 #, python-format
 msgid ""
 "Successfully created snapshot: %(snap)s for volume backing: %(backing)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:978
+#: cinder/volume/drivers/vmware/volumeops.py:980
 #, 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:989
+#: cinder/volume/drivers/vmware/volumeops.py:991
 #, python-format
 msgid "Successfully deleted snapshot: %(name)s of backing: %(backing)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1116
+#: cinder/volume/drivers/vmware/volumeops.py:1118
 #, python-format
 msgid "Renaming backing VM: %(backing)s to %(new_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1125
+#: cinder/volume/drivers/vmware/volumeops.py:1127
 #, python-format
 msgid "Backing VM: %(backing)s renamed to %(new_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1170
+#: cinder/volume/drivers/vmware/volumeops.py:1172
 #, python-format
 msgid "Successfully deleted file: %s."
 msgstr "Erfolgreich gelöschte Datei: %s."
 
-#: cinder/volume/drivers/vmware/volumeops.py:1319
+#: cinder/volume/drivers/vmware/volumeops.py:1321
 #, python-format
 msgid "Successfully copied disk at: %(src)s to: %(dest)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/volumeops.py:1337
+#: cinder/volume/drivers/vmware/volumeops.py:1339
 #, python-format
 msgid "Deleted vmdk file: %s."
 msgstr "Gelöschte vmdk-Datei: %s."
@@ -2527,38 +2658,38 @@ msgstr ""
 msgid "source volume for cloning: %s"
 msgstr ""
 
-#: cinder/volume/flows/manager/create_volume.py:619
+#: cinder/volume/flows/manager/create_volume.py:622
 #, python-format
 msgid ""
 "Volume %(volume_id)s: being created as %(create_type)s with specification: "
 "%(volume_spec)s"
 msgstr ""
 
-#: cinder/volume/targets/lio.py:46 cinder/volume/targets/tgt.py:334
+#: cinder/volume/targets/lio.py:49 cinder/volume/targets/tgt.py:328
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %s"
 msgstr ""
 "'remove_export' wird übersprungen. Kein 'iscsi_target' bereitgestellt für "
 "Datenträger: %s"
 
-#: cinder/volume/targets/lio.py:63
+#: cinder/volume/targets/lio.py:66
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provision for volume: %s"
 msgstr ""
 "ensure_export wird übersprungen. Keine iscsi_target-Bestimmung für "
 "Datenträger: %s"
 
-#: cinder/volume/targets/lio.py:96
+#: cinder/volume/targets/lio.py:99
 #, python-format
 msgid "Creating iscsi_target for volume: %s"
 msgstr "Erstellung von iscsi_target für Datenträger: %s"
 
-#: cinder/volume/targets/lio.py:128
+#: cinder/volume/targets/lio.py:131
 #, python-format
 msgid "Removing iscsi_target: %s"
 msgstr "Entfernen von iscsi_target: %s"
 
-#: cinder/volume/targets/tgt.py:349
+#: cinder/volume/targets/tgt.py:343
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume: %s"
@@ -2566,7 +2697,7 @@ msgstr ""
 "'remove_export' wird übersprungen. Aktuell ist kein 'iscsi_target' "
 "exportiert für Datenträger: %s"
 
-#: cinder/volume/targets/tgt.py:363
+#: cinder/volume/targets/tgt.py:357
 #, python-format
 msgid "Removing iscsi_target for: %s"
 msgstr "Entfernen von iscsi_target für: %s"