From: Andreas Jaeger <aj@suse.de>
Date: Thu, 24 Sep 2015 19:14:13 +0000 (+0200)
Subject: Cleanup of Translations
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cc0e6118f60964c162d6482dc96454ffec30e061;p=openstack-build%2Fcinder-build.git

Cleanup of Translations

In preparation for the release, do some cleanups for translations.

Removes all po files that are partially translated. The translation
team has decided to exclude files with less than 66 % of translated
content. There is no content lost, all data is in the translation
server, we just remove it from the repository.

This updates also recreates pot (translation source files) to
reflect the state of the repository in case there was no recent
import for them.

This change needs to be done manually since the automatic import does
not handle some of these cases.

Change-Id: I7131dbf556627c5ad6fc237bab1e6b867f55c7f8
---

diff --git a/cinder/locale/cinder-log-error.pot b/cinder/locale/cinder-log-error.pot
index f79617607..893e13b4b 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 7.0.0.0b4.dev130\n"
+"Project-Id-Version: cinder 7.0.0.0rc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:19+0000\n"
+"POT-Creation-Date: 2015-09-24 21:13+0200\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"
@@ -269,15 +269,19 @@ msgstr ""
 msgid "Error renaming logical volume"
 msgstr ""
 
-#: cinder/cmd/all.py:65
+#: cinder/cmd/all.py:75
 msgid "Failed to load osapi_volume"
 msgstr ""
 
-#: cinder/cmd/all.py:71
+#: cinder/cmd/all.py:81
 #, python-format
 msgid "Failed to load %s"
 msgstr ""
 
+#: cinder/cmd/all.py:103
+msgid "Failed to load conder-volume"
+msgstr ""
+
 #: cinder/cmd/volume_usage_audit.py:122
 #, python-format
 msgid "Exists volume notification failed: %s"
@@ -382,12 +386,12 @@ msgstr ""
 msgid "VolumeType %s deletion failed, VolumeType in use."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3662
+#: cinder/db/sqlalchemy/api.py:3664
 #, python-format
 msgid "Volume in unexpected state %s, expected awaiting-transfer"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3954
+#: cinder/db/sqlalchemy/api.py:3956
 #, python-format
 msgid "DBError detected when purging from table=%(table)s"
 msgstr ""
@@ -1044,7 +1048,7 @@ msgstr ""
 msgid "Disconnection failed with message: %(msg)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:885
+#: cinder/volume/drivers/pure.py:886
 #, python-format
 msgid ""
 "Purity host %(host_name)s is not managed by Cinder and can't have CHAP "
@@ -1052,7 +1056,7 @@ msgid ""
 "issue."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:895
+#: cinder/volume/drivers/pure.py:896
 #, python-format
 msgid ""
 "Purity host %(host_name)s is managed by Cinder but CHAP credentials could"
@@ -2284,31 +2288,31 @@ msgstr ""
 msgid "Error happened during storage pool querying, %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2044
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2037
 msgid "The given extra_spec or valid_values is None."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2698
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2691
 #, python-format
 msgid "Create consistency group %s failed."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2716
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2709
 #, python-format
 msgid "Delete consistency group %s failed."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2780
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2773
 #, python-format
 msgid "Create cg snapshot %s failed."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2805
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2798
 #, python-format
 msgid "Delete cgsnapshot %s failed."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3222
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3214
 #, python-format
 msgid "Failed to find available iSCSI targets for %s."
 msgstr ""
@@ -2438,7 +2442,7 @@ msgstr ""
 msgid "Unable to rename lun %s on array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:565
+#: cinder/volume/drivers/huawei/huawei_driver.py:557
 msgid "Retype volume error."
 msgstr ""
 
@@ -2473,13 +2477,13 @@ msgstr ""
 msgid "Can't open the recent url, relogin."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:422
+#: cinder/volume/drivers/huawei/rest_client.py:420
 msgid ""
 "Error occurred when adding hostgroup and lungroup to view. Remove lun "
 "from lungroup now."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:573
+#: cinder/volume/drivers/huawei/rest_client.py:569
 #, python-format
 msgid "JSON transfer data error. %s."
 msgstr ""
@@ -2696,7 +2700,7 @@ msgstr ""
 msgid "Failed to rename %(new_volume)s into %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:256
+#: cinder/volume/drivers/netapp/utils.py:282
 #, python-format
 msgid "Cannot get QoS spec for volume %s."
 msgstr ""
@@ -2753,43 +2757,63 @@ msgstr ""
 msgid "Setting QoS for %s failed"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:383
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:352
+#, python-format
+msgid ""
+"Could not do delete of volume %s on filer, falling back to exec of \"rm\""
+" command."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:358
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:388
+#, python-format
+msgid "Exec of \"rm\" command on backing file for %s was unsuccessful."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:382
+#, python-format
+msgid ""
+"Could not do delete of snapshot %s on filer, falling back to exec of "
+"\"rm\" command."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:431
 #, python-format
 msgid "Copy offload workflow unsuccessful. %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:438
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:486
 #, python-format
 msgid "Error in workflow copy from cache. %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:94
+#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:99
 #, python-format
 msgid "Error provisioning volume %(lun_name)s on %(volume_name)s. Details: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:194
+#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:199
 #, python-format
 msgid "LUN %(path)s geometry failed. Message - %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:220
+#: cinder/volume/drivers/netapp/eseries/library.py:229
 #, python-format
 msgid "Error resolving host %(host)s. Error - %(e)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:421
-#: cinder/volume/drivers/netapp/eseries/library.py:439
+#: cinder/volume/drivers/netapp/eseries/library.py:430
+#: cinder/volume/drivers/netapp/eseries/library.py:448
 #, python-format
 msgid "Error creating volume. Msg - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:461
+#: cinder/volume/drivers/netapp/eseries/library.py:470
 #, python-format
 msgid "Failure deleting snap vol. Error: %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:492
+#: cinder/volume/drivers/netapp/eseries/library.py:501
 #, python-format
 msgid "Vol copy job status %s."
 msgstr ""
@@ -3145,57 +3169,57 @@ msgstr ""
 msgid "There is no valid datastore satisfying requirements: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:863
+#: cinder/volume/drivers/vmware/vmdk.py:873
 #, python-format
 msgid "Error occurred while copying %(src)s to %(dst)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:970
+#: cinder/volume/drivers/vmware/vmdk.py:980
 #, python-format
 msgid "Error occurred while copying image: %(image_id)s to %(path)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1101
+#: cinder/volume/drivers/vmware/vmdk.py:1111
 #, python-format
 msgid "Error occurred while creating volume: %(id)s from image: %(image_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1176
-#: cinder/volume/drivers/vmware/vmdk.py:1276
+#: cinder/volume/drivers/vmware/vmdk.py:1186
+#: cinder/volume/drivers/vmware/vmdk.py:1286
 #, python-format
 msgid "Error occurred while copying image: %(id)s to volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1217
+#: cinder/volume/drivers/vmware/vmdk.py:1227
 #, python-format
 msgid "Unable to extend the size of the vmdk virtual disk at the path %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1488
+#: cinder/volume/drivers/vmware/vmdk.py:1498
 #, python-format
 msgid "Error occurred while cloning backing: %s during retype."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1553
+#: cinder/volume/drivers/vmware/vmdk.py:1563
 #, python-format
 msgid "Not able to find a different datastore to place the extended volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1568
+#: cinder/volume/drivers/vmware/vmdk.py:1578
 #, python-format
 msgid "Not able to relocate volume %s for extending."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1684
+#: cinder/volume/drivers/vmware/vmdk.py:1694
 msgid "Error occurred while creating temporary backing."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1868
+#: cinder/volume/drivers/vmware/vmdk.py:1878
 #, python-format
 msgid "Version string '%s' is not parseable"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1896
+#: cinder/volume/drivers/vmware/vmdk.py:1906
 #, python-format
 msgid "Not able to configure PBM for vCenter server: %s"
 msgstr ""
@@ -3668,16 +3692,16 @@ msgstr ""
 msgid "Unable to get device mapping from network."
 msgstr ""
 
-#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:140
+#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:128
 #, python-format
 msgid "Failed collecting name server info from fabric %s"
 msgstr ""
 
-#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:199
+#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:189
 msgid "Failed collecting nsshow info for fabric"
 msgstr ""
 
-#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:206
+#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:198
 msgid "Failed collecting nscamshow"
 msgstr ""
 
diff --git a/cinder/locale/cinder-log-info.pot b/cinder/locale/cinder-log-info.pot
index ac7667729..2686742d1 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 7.0.0.0b4.dev130\n"
+"Project-Id-Version: cinder 7.0.0.0rc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:19+0000\n"
+"POT-Creation-Date: 2015-09-24 21:13+0200\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"
@@ -373,12 +373,12 @@ msgid ""
 "lv_name=%(lv)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3944
+#: cinder/db/sqlalchemy/api.py:3946
 #, python-format
 msgid "Purging deleted rows older than age=%(age)d days from table=%(table)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3959
+#: cinder/db/sqlalchemy/api.py:3961
 #, python-format
 msgid "Deleted %(row)d rows from table=%(table)s"
 msgstr ""
@@ -1077,27 +1077,27 @@ msgstr ""
 msgid "Deleting unneeded host %(host_name)r."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:563 cinder/volume/drivers/pure.py:609
+#: cinder/volume/drivers/pure.py:564 cinder/volume/drivers/pure.py:610
 #, python-format
 msgid "Renaming existing volume %(ref_name)s to %(new_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:634 cinder/volume/drivers/pure.py:665
+#: cinder/volume/drivers/pure.py:635 cinder/volume/drivers/pure.py:666
 #, python-format
 msgid "Renaming existing snapshot %(ref_name)s to %(new_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:881 cinder/volume/drivers/pure.py:984
+#: cinder/volume/drivers/pure.py:882 cinder/volume/drivers/pure.py:985
 #, python-format
 msgid "Re-using existing purity host %(host_name)r"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:904
+#: cinder/volume/drivers/pure.py:905
 #, python-format
 msgid "Creating host object %(host_name)r with IQN: %(iqn)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:988
+#: cinder/volume/drivers/pure.py:989
 #, python-format
 msgid "Creating host object %(host_name)r with WWN: %(wwn)s."
 msgstr ""
@@ -1775,80 +1775,80 @@ msgstr ""
 msgid "Cancelling Migration from LUN %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1727
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1720
 #, python-format
 msgid "Toggle storage_vnx_ip_address from %(old)s to %(new)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1815
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1808
 msgid ""
 "initiator_auto_registration: False. Initiator auto registration is not "
 "enabled. Please register initiator manually."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1991
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1984
 #, python-format
 msgid ""
 "Create Volume: %(volume)s  Size: %(size)s pool: %(pool)s provisioning: "
 "%(provisioning)s tiering: %(tiering)s snapcopy: %(snapcopy)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2472
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3764
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2465
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3756
 #, python-format
 msgid "Create snapshot: %(snapshot)s: volume: %(volume)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2501
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2494
 #, python-format
 msgid "Delete Snapshot: %(snapshot)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2687
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2680
 #: cinder/volume/drivers/prophetstor/dplcommon.py:871
 #, python-format
 msgid "Start to create consistency group: %(group_name)s id: %(id)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2710
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2703
 #: cinder/volume/drivers/prophetstor/dplcommon.py:900
 #, python-format
 msgid "Start to delete consistency group: %(cg_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2770
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2763
 #: cinder/volume/drivers/prophetstor/dplcommon.py:927
 #, python-format
 msgid "Start to create cgsnapshot for consistency group: %(group_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2795
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2788
 #: cinder/volume/drivers/prophetstor/dplcommon.py:955
 #, python-format
 msgid "Delete cgsnapshot %(snap_name)s for consistency group: %(group_name)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2974
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2967
 #, python-format
 msgid "Get ISCSI targets %(tg)s to register initiator %(in)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3001
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2994
 #, python-format
 msgid "Get FC targets %(tg)s to register initiator %(in)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3074
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3067
 #, python-format
 msgid "iSCSI Initiators %(in)s of %(ins)s need registration."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3093
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3086
 #, python-format
 msgid "FC Initiators %(in)s of %(ins)s need registration"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3321
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3313
 #, python-format
 msgid "Storage Group %s was empty."
 msgstr ""
@@ -2346,90 +2346,90 @@ msgstr ""
 msgid "Extend volume: %(volumename)s, oldsize: %(oldsize)s  newsize: %(newsize)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:515
+#: cinder/volume/drivers/huawei/huawei_driver.py:507
 #, python-format
 msgid "stop_snapshot: snapshot name: %(snapshot)s, volume name: %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:579
+#: cinder/volume/drivers/huawei/huawei_driver.py:571
 #, python-format
 msgid ""
 "Retype LUN(id: %(lun_id)s) smartpartition from (name: %(old_name)s, id: "
 "%(old_id)s) to (name: %(new_name)s, id: %(new_id)s) success."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:596
+#: cinder/volume/drivers/huawei/huawei_driver.py:588
 #, python-format
 msgid ""
 "Retype LUN(id: %(lun_id)s) smartcache from (name: %(old_name)s, id: "
 "%(old_id)s) to (name: %(new_name)s, id: %(new_id)s) successfully."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:606
+#: cinder/volume/drivers/huawei/huawei_driver.py:598
 #, python-format
 msgid ""
 "Retype LUN(id: %(lun_id)s) smarttier policy from %(old_policy)s to "
 "%(new_policy)s success."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:621
+#: cinder/volume/drivers/huawei/huawei_driver.py:613
 #, python-format
 msgid ""
 "Retype LUN(id: %(lun_id)s) smartqos from %(old_qos_value)s to %(new_qos)s"
 " success."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:840
+#: cinder/volume/drivers/huawei/huawei_driver.py:832
 msgid "Enter initialize_connection."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:844
+#: cinder/volume/drivers/huawei/huawei_driver.py:836
 #, python-format
 msgid "initiator name: %(initiator_name)s, volume name: %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:854
+#: cinder/volume/drivers/huawei/huawei_driver.py:846
 #, python-format
 msgid ""
 "initialize_connection, iscsi_iqn: %(iscsi_iqn)s, target_ip: "
 "%(target_ip)s, portgroup_id: %(portgroup_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:884
+#: cinder/volume/drivers/huawei/huawei_driver.py:876
 #, python-format
 msgid "initialize_connection, host lun id is: %s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:913
+#: cinder/volume/drivers/huawei/huawei_driver.py:905
 #, python-format
 msgid "initialize_connection success. Return data: %s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:926
+#: cinder/volume/drivers/huawei/huawei_driver.py:918
 #, python-format
 msgid ""
 "terminate_connection: volume name: %(volume)s, initiator name: %(ini)s, "
 "lun_id: %(lunid)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:1039
+#: cinder/volume/drivers/huawei/huawei_driver.py:1031
 #, python-format
 msgid "initialize_connection, initiator: %(wwpns)s, volume name: %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:1107
+#: cinder/volume/drivers/huawei/huawei_driver.py:1099
 #, python-format
 msgid "initialize_connection, return data is: %s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:1123
+#: cinder/volume/drivers/huawei/huawei_driver.py:1115
 #, python-format
 msgid ""
 "terminate_connection: volume name: %(volume)s, wwpns: %(wwns)s, lun_id: "
 "%(lunid)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:1204
+#: cinder/volume/drivers/huawei/huawei_driver.py:1196
 #, python-format
 msgid "terminate_connection, return data is: %s."
 msgstr ""
@@ -2474,80 +2474,80 @@ msgid ""
 "\n"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:250
+#: cinder/volume/drivers/huawei/rest_client.py:248
 #, python-format
 msgid "create_snapshot:snapshot name: %(snapshot)s, volume name: %(volume)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:386
+#: cinder/volume/drivers/huawei/rest_client.py:384
 #, python-format
 msgid ""
-"mapping_hostgroup_and_lungroup, lun_group: %(lun_group)s, view_id: "
-"%(view_id)s, lun_id: %(lun_id)s."
+"do_mapping, lun_group: %(lun_group)s, view_id: %(view_id)s, lun_id: "
+"%(lun_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:468
+#: cinder/volume/drivers/huawei/rest_client.py:464
 #, python-format
 msgid ""
 "create_hostgroup_with_check. hostgroup name: %(name)s, hostgroup id: "
 "%(id)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:479
+#: cinder/volume/drivers/huawei/rest_client.py:475
 #, python-format
 msgid ""
 "Failed to create hostgroup: %(name)s. Please check if it exists on the "
 "array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:492
+#: cinder/volume/drivers/huawei/rest_client.py:488
 #, python-format
 msgid ""
 "create_hostgroup_with_check. Create hostgroup success. hostgroup name: "
 "%(name)s, hostgroup id: %(id)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:589
+#: cinder/volume/drivers/huawei/rest_client.py:584
 #, python-format
 msgid "add_host_with_check. host name: %(name)s, host id: %(id)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:600
+#: cinder/volume/drivers/huawei/rest_client.py:595
 #, python-format
 msgid "Failed to create host: %(name)s. Check if it exists on the array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:613
+#: cinder/volume/drivers/huawei/rest_client.py:608
 #, python-format
 msgid ""
 "add_host_with_check. create host success. host name: %(name)s, host id: "
 "%(id)s"
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:753
+#: cinder/volume/drivers/huawei/rest_client.py:748
 msgid "Use CHAP when adding initiator to host."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:759
+#: cinder/volume/drivers/huawei/rest_client.py:754
 msgid "Use ALUA when adding initiator to host."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1065
+#: cinder/volume/drivers/huawei/rest_client.py:1058
 #, python-format
 msgid "New str info is: %s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1080
+#: cinder/volume/drivers/huawei/rest_client.py:1073
 #, python-format
 msgid "_get_tgt_iqn: iSCSI target iqn is: %s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1176
+#: cinder/volume/drivers/huawei/rest_client.py:1169
 #, python-format
 msgid "_get_tgt_ip_from_portgroup: Get ip: %s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1215
+#: cinder/volume/drivers/huawei/rest_client.py:1208
 #, python-format
 msgid "Get the default ip: %s."
 msgstr ""
@@ -2582,7 +2582,7 @@ msgid "Initialized driver for IBMNAS Platform: %s."
 msgstr ""
 
 #: cinder/volume/drivers/ibm/storwize_svc/__init__.py:577
-#: cinder/volume/drivers/netapp/eseries/library.py:701
+#: cinder/volume/drivers/netapp/eseries/library.py:710
 msgid "Need to remove FC Zone, building initiator target map."
 msgstr ""
 
@@ -2717,22 +2717,22 @@ msgid ""
 "%(storage_protocol)s loaded."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:382
+#: cinder/volume/drivers/netapp/utils.py:408
 #, python-format
 msgid "No rpm info found for %(pkg)s package."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:391
+#: cinder/volume/drivers/netapp/utils.py:417
 #, python-format
 msgid "Could not run rpm command: %(msg)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:402
+#: cinder/volume/drivers/netapp/utils.py:428
 #, python-format
 msgid "No dpkg-query info found for %(pkg)s package."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:420
+#: cinder/volume/drivers/netapp/utils.py:446
 #, python-format
 msgid "Could not run dpkg-query command: %(msg)s."
 msgstr ""
@@ -2799,12 +2799,12 @@ msgstr ""
 msgid "Cinder NFS volume with current path \"%(cr)s\" is no longer being managed."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:370
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:418
 #, python-format
 msgid "Copied image %(img)s to volume %(vol)s using local image cache."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:378
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:426
 #, python-format
 msgid "Copied image %(img)s to volume %(vol)s using copy offload workflow."
 msgstr ""
@@ -2829,114 +2829,114 @@ msgstr ""
 msgid "Successfully completed ssc job for %(server)s and vserver %(vs)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:166
+#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:171
 #, python-format
 msgid "Resizing LUN %s directly to new size."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:204
+#: cinder/volume/drivers/netapp/eseries/library.py:213
 #, python-format
 msgid ""
 "The multi-attach E-Series host group '%(label)s' already exists with "
 "clusterRef %(clusterRef)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:210
+#: cinder/volume/drivers/netapp/eseries/library.py:219
 #, python-format
 msgid ""
 "Created multi-attach E-Series host group %(label)s with clusterRef "
 "%(clusterRef)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:232
+#: cinder/volume/drivers/netapp/eseries/library.py:241
 msgid "Embedded mode detected."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:235
+#: cinder/volume/drivers/netapp/eseries/library.py:244
 msgid "Proxy mode detected."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:247
+#: cinder/volume/drivers/netapp/eseries/library.py:256
 #, python-format
 msgid "System with controller addresses [%s] is not registered with web service."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:265
+#: cinder/volume/drivers/netapp/eseries/library.py:274
 msgid "Waiting for web service array communication."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:282
+#: cinder/volume/drivers/netapp/eseries/library.py:291
 #, python-format
 msgid "System %(id)s has %(status)s status."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:417
-#: cinder/volume/drivers/netapp/eseries/library.py:436
-#: cinder/volume/drivers/netapp/eseries/library.py:452
+#: cinder/volume/drivers/netapp/eseries/library.py:426
+#: cinder/volume/drivers/netapp/eseries/library.py:445
+#: cinder/volume/drivers/netapp/eseries/library.py:461
 #, python-format
 msgid "Created volume with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:479
+#: cinder/volume/drivers/netapp/eseries/library.py:488
 #, python-format
 msgid "Copying src vol %(src)s to dest vol %(dst)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:496
+#: cinder/volume/drivers/netapp/eseries/library.py:505
 #, python-format
 msgid "Vol copy job completed for dest %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:509
+#: cinder/volume/drivers/netapp/eseries/library.py:518
 #, python-format
 msgid "Copy job to dest vol %s completed."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:547
+#: cinder/volume/drivers/netapp/eseries/library.py:556
 #, python-format
 msgid "Created snap grp with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:851
+#: cinder/volume/drivers/netapp/eseries/library.py:860
 #, python-format
 msgid "Creating host with ports %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:937
+#: cinder/volume/drivers/netapp/eseries/library.py:946
 #, python-format
 msgid "E-series proxy API version %s does not support autosupport logging."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:978
+#: cinder/volume/drivers/netapp/eseries/library.py:987
 #, python-format
 msgid "Updating storage service catalog information for backend '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:993
+#: cinder/volume/drivers/netapp/eseries/library.py:1002
 #, python-format
 msgid ""
 "E-series proxy API version %(version)s does not support full set of SSC "
 "extra specs. The proxy version must be at at least %(min_version)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1160
+#: cinder/volume/drivers/netapp/eseries/library.py:1195
 #, python-format
 msgid "Extended volume with label %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1196
+#: cinder/volume/drivers/netapp/eseries/library.py:1231
 #, python-format
 msgid "Volume with given ref %s need not be renamed during manage operation."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1201
+#: cinder/volume/drivers/netapp/eseries/library.py:1236
 #, python-format
 msgid ""
 "Manage operation completed for volume with new label %(label)s and wwn "
 "%(wwn)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1235
+#: cinder/volume/drivers/netapp/eseries/library.py:1270
 #, python-format
 msgid "Unmanaged volume with current label %(label)s and wwn %(wwn)s."
 msgstr ""
@@ -3248,7 +3248,7 @@ msgid "Unexporting lun %s."
 msgstr ""
 
 #: cinder/volume/drivers/vmware/vmdk.py:293
-#: cinder/volume/drivers/vmware/vmdk.py:1916
+#: cinder/volume/drivers/vmware/vmdk.py:1926
 #, python-format
 msgid "Successfully setup driver: %(driver)s for server: %(ip)s."
 msgstr ""
@@ -3309,82 +3309,82 @@ msgid ""
 msgstr ""
 
 #: cinder/volume/drivers/vmware/vmdk.py:773
-#: cinder/volume/drivers/vmware/vmdk.py:2055
+#: cinder/volume/drivers/vmware/vmdk.py:2065
 #, python-format
 msgid ""
 "There is no snapshot point for the snapshotted volume: %(snap)s. Not "
 "creating any backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1184
+#: cinder/volume/drivers/vmware/vmdk.py:1194
 #, python-format
 msgid "Done copying image: %(id)s to volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1195
+#: cinder/volume/drivers/vmware/vmdk.py:1205
 #, python-format
 msgid ""
 "The backing is not found, so there is no need to extend the vmdk virtual "
 "disk for the volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1326
+#: cinder/volume/drivers/vmware/vmdk.py:1336
 #, python-format
 msgid "Backing not found, creating for volume: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1349
+#: cinder/volume/drivers/vmware/vmdk.py:1359
 #, python-format
 msgid "Done copying volume %(vol)s to a new image %(img)s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1540
-#: cinder/volume/drivers/vmware/vmdk.py:1570
+#: cinder/volume/drivers/vmware/vmdk.py:1550
+#: cinder/volume/drivers/vmware/vmdk.py:1580
 #, python-format
 msgid "Done extending volume %(vol)s to size %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1545
+#: cinder/volume/drivers/vmware/vmdk.py:1555
 #, python-format
 msgid ""
 "Relocating volume %s vmdk to a different datastore since trying to extend"
 " vmdk file in place failed."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1556
+#: cinder/volume/drivers/vmware/vmdk.py:1566
 #, python-format
 msgid "Selected datastore %(ds)s to place extended volume of size %(size)s GB."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1857
+#: cinder/volume/drivers/vmware/vmdk.py:1867
 #, python-format
 msgid "Using overridden vmware_host_version from config: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1861
+#: cinder/volume/drivers/vmware/vmdk.py:1871
 #, python-format
 msgid "Fetched vCenter server version: %s"
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1914
+#: cinder/volume/drivers/vmware/vmdk.py:1924
 #, python-format
 msgid "Using compute cluster(s): %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:2033
+#: cinder/volume/drivers/vmware/vmdk.py:2043
 #: cinder/volume/drivers/vmware/volumeops.py:1187
 #, python-format
 msgid "Successfully created clone: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:2047
+#: cinder/volume/drivers/vmware/vmdk.py:2057
 #, python-format
 msgid ""
 "There is no backing for the snapshotted volume: %(snap)s. Not creating "
 "any backing for the volume: %(vol)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:2084
+#: cinder/volume/drivers/vmware/vmdk.py:2094
 #, python-format
 msgid ""
 "There is no backing for the source volume: %(src)s. Not creating any "
diff --git a/cinder/locale/cinder-log-warning.pot b/cinder/locale/cinder-log-warning.pot
index f83736bd4..07372997c 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 7.0.0.0b4.dev130\n"
+"Project-Id-Version: cinder 7.0.0.0rc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:19+0000\n"
+"POT-Creation-Date: 2015-09-24 21:13+0200\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"
@@ -526,17 +526,17 @@ msgstr ""
 msgid "Purity host deletion failed: %(msg)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:415
+#: cinder/volume/drivers/pure.py:416
 #, python-format
 msgid "Unable to delete Protection Group: %s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:480
+#: cinder/volume/drivers/pure.py:481
 #, python-format
 msgid "Unable to delete Protection Group Snapshot: %s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:594
+#: cinder/volume/drivers/pure.py:595
 #, python-format
 msgid "Unable to rename %(old_name)s, error message: %(error)s"
 msgstr ""
@@ -1080,146 +1080,146 @@ msgstr ""
 msgid "See unavailable iSCSI target: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1811
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1804
 msgid ""
 "destroy_empty_storage_group: True. Empty storage group will be deleted "
 "after volume is detached."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1832
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1825
 msgid "force_delete_lun_in_storagegroup=True"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1839
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1832
 msgid ""
 "ignore_pool_full_threshold: True. LUN creation will still be forced even "
 "if the pool full threshold is exceeded."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1859
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1852
 #, python-format
 msgid ""
 "The following specified storage pools do not exist: %(unexist)s. This "
 "host will only manage the storage pools: %(exist)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2023
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2016
 msgid ""
 "Extra spec key 'storagetype:pool' is obsoleted since driver version "
 "5.1.0. This key will be ignored."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2058
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2051
 msgid ""
 "Both 'storagetype:prvosioning' and 'provisioning:type' are set in the "
 "extra specs, the value of 'provisioning:type' will be used. The key "
 "'storagetype:provisioning' may be deprecated in the next release."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2067
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2060
 msgid ""
 "Extra spec key 'storagetype:provisioning' may be deprecated in the next "
 "release. It is recommended to use extra spec key 'provisioning:type' "
 "instead."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2120
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2113
 #, python-format
 msgid ""
 "LUN corresponding to %s is still in some Storage Groups.Try to bring the "
 "LUN out of Storage Groups and retry the deletion."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2153
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2146
 #, python-format
 msgid "LUN %(name)s is not ready for extension: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2174
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2167
 msgid ""
 "Failed to get target_pool_name and target_array_serial. 'location_info' "
 "is not in host['capabilities']."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2187
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2180
 msgid "Error on parsing target_pool_name/target_array_serial."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2201
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2194
 #, python-format
 msgid ""
 "Didn't get the pool information of the host %s. Storage assisted "
 "Migration is not supported. The host may be using a legacy driver."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2311
-#: cinder/volume/drivers/huawei/huawei_driver.py:557
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2304
+#: cinder/volume/drivers/huawei/huawei_driver.py:549
 msgid "Storage-assisted migration failed during retype."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2373
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2366
 #, python-format
 msgid "Storage Pool '%(pool)s' is '%(state)s'."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2383
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2376
 #, python-format
 msgid ""
 "Maximum number of Pool LUNs, %s, have been created. No more LUN creation "
 "can be done."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2487
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2480
 #, python-format
 msgid "LUN %(name)s is not ready for snapshot: %(out)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2751
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2744
 #, python-format
 msgid "LUN with id %(remove_id)s is not present in cg %(cg_name)s, skip it."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2845
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2838
 #, python-format
 msgid "Storage Group %s is not found. Create it."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2910
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2903
 #, python-format
 msgid "Failed to register %(itor)s to SP%(sp)s port %(portid)s because: %(msg)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3029
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3022
 #, python-format
 msgid "Failed to extract initiators of %s, so ignore deregistration operation."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3036
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3029
 #, python-format
 msgid "Failed to deregister %(itor)s because: %(msg)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3297
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3289
 #, python-format
 msgid "Storage Group %s is not found. terminate_connection() is unnecessary."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3306
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3298
 #, python-format
 msgid "Volume %(vol)s was not in Storage Group %(sg)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3328
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3320
 #, python-format
 msgid "Failed to destroy Storage Group %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3334
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3326
 #, python-format
 msgid "Fail to connect host %(host)s back to storage group %(sg)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3539
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3531
 #, python-format
 msgid ""
 "Delete the temporary cgsnapshot %(name)s failed. This temporary "
@@ -1227,39 +1227,39 @@ msgid ""
 "successfully from cgsnapshot %(cgsnapshot)s. Message: %(msg)s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3575
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3567
 #, python-format
 msgid ""
 "The source volume is a legacy volume. Create volume in the pool where the"
 " source volume %s is created."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3650
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3642
 #, python-format
 msgid "CreateSMPTask.revert: delete mount point %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3670
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3662
 #, python-format
 msgid "AttachSnapTask.revert: detach mount point %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3708
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3700
 #, python-format
 msgid "CreateDestLunTask.revert: delete temp lun %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3775
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3767
 #, python-format
 msgid "CreateSnapshotTask.revert: delete temp cgsnapshot %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3780
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3772
 #, python-format
 msgid "CreateSnapshotTask.revert: delete temp snapshot %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3802
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3794
 #, python-format
 msgid ""
 "CopySnapshotTask.revert: delete the copied snapshot %(new_name)s of "
@@ -1348,28 +1348,28 @@ msgstr ""
 msgid "Failure deleting the snapshot %(snapshot_id)s of volume %(volume_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:530
-#: cinder/volume/drivers/huawei/huawei_driver.py:532
+#: cinder/volume/drivers/huawei/huawei_driver.py:522
+#: cinder/volume/drivers/huawei/huawei_driver.py:524
 msgid "Can't find snapshot on the array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:965
+#: cinder/volume/drivers/huawei/huawei_driver.py:957
 #, python-format
 msgid "Lun is not in lungroup. Lun id: %(lun_id)s. lungroup id: %(lungroup_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:971
-#: cinder/volume/drivers/huawei/huawei_driver.py:1152
+#: cinder/volume/drivers/huawei/huawei_driver.py:963
+#: cinder/volume/drivers/huawei/huawei_driver.py:1144
 msgid "Can't find lun on the array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:1146
+#: cinder/volume/drivers/huawei/huawei_driver.py:1138
 #, python-format
 msgid "Lun is not in lungroup. Lun id: %(lun_id)s. Lungroup id: %(lungroup_id)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1231
-#: cinder/volume/drivers/huawei/rest_client.py:1240
+#: cinder/volume/drivers/huawei/rest_client.py:1224
+#: cinder/volume/drivers/huawei/rest_client.py:1233
 msgid "Can't find target iqn from rest."
 msgstr ""
 
@@ -1511,32 +1511,39 @@ msgstr ""
 msgid "The provisioning: %(provisioning)s is not valid."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:66
+#: cinder/volume/drivers/netapp/utils.py:67
 msgid ""
 "It is not the recommended way to use drivers by NetApp. Please use "
 "NetAppDriver to achieve the functionality."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:149
+#: cinder/volume/drivers/netapp/utils.py:150
 #, python-format
 msgid "Extra spec %(old)s is obsolete.  Use %(new)s instead."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:154
+#: cinder/volume/drivers/netapp/utils.py:155
 #, python-format
 msgid "Extra spec %(old)s is deprecated.  Use %(new)s instead."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:132
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:139
 #, python-format
 msgid "Could not determine root volume name on %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:331
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:320
+msgid ""
+"The option 'netapp_volume_list' is deprecated and will be removed in the "
+"future releases. Please use the option 'netapp_pool_name_search_pattern' "
+"instead."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:366
 msgid "Volume refresh job already running. Returning..."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:338
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:374
 #, python-format
 msgid "Error refreshing volume info. Message: %s"
 msgstr ""
@@ -1611,27 +1618,27 @@ msgstr ""
 msgid "Error finding LUNs for volume %s. Verify volume exists."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:124
+#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:129
 #, python-format
 msgid "Error mapping LUN. Code :%(code)s, Message: %(message)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:137
+#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:142
 #, python-format
 msgid "Error unmapping LUN. Code :%(code)s, Message: %(message)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:345
+#: cinder/volume/drivers/netapp/dataontap/client/client_base.py:350
 #, python-format
 msgid "Failed to invoke ems. Message : %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:380
+#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:389
 #, python-format
 msgid "Rename failure in cleanup of cDOT QOS policy group %(name)s: %(ex)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:193
+#: cinder/volume/drivers/netapp/eseries/library.py:194
 #, python-format
 msgid ""
 "Production use of \"%(backend)s\" backend requires the Cinder controller "
@@ -1639,51 +1646,58 @@ msgid ""
 "\"%(mpflag)s\" to be set to \"True\"."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:463
+#: cinder/volume/drivers/netapp/eseries/library.py:472
 msgid "Snapshot volume not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:504
+#: cinder/volume/drivers/netapp/eseries/library.py:513
 #, python-format
 msgid "Failure deleting job %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:507
+#: cinder/volume/drivers/netapp/eseries/library.py:516
 #, python-format
 msgid "Volume copy job for src vol %s not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:522
+#: cinder/volume/drivers/netapp/eseries/library.py:531
 #, python-format
 msgid "Failure deleting temp snapshot %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:531
+#: cinder/volume/drivers/netapp/eseries/library.py:540
 #, python-format
 msgid "Volume %s already deleted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:558
+#: cinder/volume/drivers/netapp/eseries/library.py:567
 #, python-format
 msgid "Snapshot %s already deleted."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:824
+#: cinder/volume/drivers/netapp/eseries/library.py:833
 #, python-format
 msgid "Unable to update host type for host with label %(l)s. %(e)s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:829
+#: cinder/volume/drivers/netapp/eseries/library.py:838
 #, python-format
 msgid "Message - %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1143
+#: cinder/volume/drivers/netapp/eseries/library.py:1131
+msgid ""
+"The option 'netapp_storage_pools' is deprecated and will be removed in "
+"the future releases. Please use the option "
+"'netapp_pool_name_search_pattern' instead."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/eseries/library.py:1169
 #, python-format
 msgid "No storage pool found with available capacity %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1174
+#: cinder/volume/drivers/netapp/eseries/library.py:1209
 msgid "Returning as clean tmp vol job already running."
 msgstr ""
 
@@ -1868,48 +1882,48 @@ msgstr ""
 msgid "Trying to boot from an empty volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:849
+#: cinder/volume/drivers/vmware/vmdk.py:859
 #, python-format
 msgid "Error occurred while deleting temporary disk: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:980
+#: cinder/volume/drivers/vmware/vmdk.py:990
 #, python-format
 msgid "Error occurred while deleting descriptor: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1013
+#: cinder/volume/drivers/vmware/vmdk.py:1023
 #, python-format
 msgid "Error occurred while deleting backing: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1379
+#: cinder/volume/drivers/vmware/vmdk.py:1389
 #, python-format
 msgid "Volume: %s is in use, can't retype."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1448
+#: cinder/volume/drivers/vmware/vmdk.py:1458
 #, python-format
 msgid ""
 "There are no datastores matching new requirements; can't retype volume: "
 "%s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1503
+#: cinder/volume/drivers/vmware/vmdk.py:1513
 #, python-format
 msgid ""
 "Changing backing: %(backing)s name from %(new_name)s to %(old_name)s "
 "failed."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1750
+#: cinder/volume/drivers/vmware/vmdk.py:1760
 #, python-format
 msgid ""
 "Cannot undo volume rename; old name was %(old_name)s and new name is "
 "%(new_name)s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1876
+#: cinder/volume/drivers/vmware/vmdk.py:1886
 #, python-format
 msgid ""
 "Running Cinder with a VMware vCenter version less than %(min_version)s is"
diff --git a/cinder/locale/cinder.pot b/cinder/locale/cinder.pot
index 5067a7d9c..621959a25 100644
--- a/cinder/locale/cinder.pot
+++ b/cinder/locale/cinder.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: cinder 7.0.0.0b4.dev130\n"
+"Project-Id-Version: cinder 7.0.0.0rc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:18+0000\n"
+"POT-Creation-Date: 2015-09-24 21:13+0200\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"
@@ -1268,17 +1268,17 @@ msgstr ""
 msgid "Tenant ID: %s does not exist."
 msgstr ""
 
-#: cinder/api/contrib/quotas.py:256
+#: cinder/api/contrib/quotas.py:265
 #, python-format
 msgid "Invalid value '%s' for skip_validation."
 msgstr ""
 
-#: cinder/api/contrib/quotas.py:271
+#: cinder/api/contrib/quotas.py:280
 #, python-format
 msgid "Bad key(s) in quota set: %s"
 msgstr ""
 
-#: cinder/api/contrib/quotas.py:378
+#: cinder/api/contrib/quotas.py:395
 msgid ""
 "About to delete child projects having non-zero quota. This should not be "
 "performed"
@@ -1475,8 +1475,8 @@ msgstr ""
 msgid "Metadata item was not found."
 msgstr ""
 
-#: cinder/api/contrib/volume_image_metadata.py:162
-msgid "Volume does not exist."
+#: cinder/api/contrib/volume_image_metadata.py:158
+msgid "The key cannot be None."
 msgstr ""
 
 #: cinder/api/contrib/volume_manage.py:143
@@ -2302,6 +2302,15 @@ msgstr ""
 msgid "Could not save configuration to %(file_path)s: %(exc)s"
 msgstr ""
 
+#: cinder/cmd/volume.py:79
+#, python-format
+msgid "Volume service %s failed to start."
+msgstr ""
+
+#: cinder/cmd/volume.py:94
+msgid "No volume service(s) started successfully, terminating."
+msgstr ""
+
 #: cinder/cmd/volume_usage_audit.py:91
 #, python-format
 msgid "The end time (%(end)s) must be after the start time (%(start)s)."
@@ -2469,38 +2478,38 @@ msgstr ""
 msgid "Sort direction array size exceeds sort key array size."
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3552
+#: cinder/db/sqlalchemy/api.py:3554
 #, python-format
 msgid "No backup with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3636
+#: cinder/db/sqlalchemy/api.py:3638
 msgid "Volume must be available"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3683
+#: cinder/db/sqlalchemy/api.py:3685
 #, 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:3783
+#: cinder/db/sqlalchemy/api.py:3785
 #, python-format
 msgid "No consistency group with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3895
+#: cinder/db/sqlalchemy/api.py:3897
 #, python-format
 msgid "No cgsnapshot with id %s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3920
+#: cinder/db/sqlalchemy/api.py:3922
 #, python-format
 msgid "Invalid value for age, %(age)s"
 msgstr ""
 
-#: cinder/db/sqlalchemy/api.py:3924
+#: cinder/db/sqlalchemy/api.py:3926
 msgid "Must supply a positive value for age"
 msgstr ""
 
@@ -2945,12 +2954,12 @@ msgstr ""
 msgid "Unexpected status code"
 msgstr ""
 
-#: cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_base.py:661
+#: cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_base.py:662
 #: cinder/volume/drivers/netapp/dataontap/block_base.py:156
 msgid "Invalid value for NetApp configuration option netapp_lun_ostype."
 msgstr ""
 
-#: cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_base.py:673
+#: cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_base.py:674
 #: cinder/volume/drivers/netapp/dataontap/block_base.py:161
 msgid "Invalid value for NetApp configuration option netapp_host_type."
 msgstr ""
@@ -4006,44 +4015,44 @@ msgstr ""
 msgid "Unable to determine snapshot name in Purity for snapshot %(id)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:512
+#: cinder/volume/drivers/pure.py:513
 msgid "manage_existing requires a 'name' key to identify an existing volume."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:540
+#: cinder/volume/drivers/pure.py:541
 #, python-format
 msgid "Unable to find Purity ref with name=%s"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:558
+#: cinder/volume/drivers/pure.py:559
 #, python-format
 msgid ""
 "%(driver)s manage_existing cannot manage a volume connected to hosts. "
 "Please disconnect this volume from existing hosts before importing"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:616
+#: cinder/volume/drivers/pure.py:617
 #, python-format
 msgid ""
 "Unable to do manage snapshot operations with Purity REST API version "
 "%(api_version)s, requires %(required_versions)s."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:749
+#: cinder/volume/drivers/pure.py:750
 msgid "Unable to connect or find connection to host"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:841
+#: cinder/volume/drivers/pure.py:842
 msgid "No iSCSI-enabled ports on target array."
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:892
+#: cinder/volume/drivers/pure.py:893
 msgid ""
 "Unable to re-use a host that is not managed by Cinder with "
 "use_chap_auth=True,"
 msgstr ""
 
-#: cinder/volume/drivers/pure.py:900
+#: cinder/volume/drivers/pure.py:901
 msgid "Unable to re-use host with unknown CHAP credentials configured."
 msgstr ""
 
@@ -5651,106 +5660,106 @@ msgstr ""
 msgid "Migration of LUN %s has been stopped or faulted."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1854
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1847
 #, python-format
 msgid ""
 "All the specified storage pools to be managed do not exist. Please check "
 "your configuration. Non-existent pools: %s"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1903
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1896
 #, python-format
 msgid "Invalid %(protocol)s ports %(port)s specified for io_port_list."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:1986
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:1979
 msgid "Volume with copytype:snap=True can not be put in consistency group."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2046
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2039
 #, python-format
 msgid "The extra_spec: %s is invalid."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2085
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2078
 msgid "deduplicated and auto tiering can't be both enabled."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2089
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2082
 msgid "Compression Enabler is not installed. Can not create compressed volume."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2095
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2088
 msgid "Deduplication Enabler is not installed. Can not create deduplicated volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2101
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2094
 msgid "ThinProvisioning Enabler is not installed. Can not create thin volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2106
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2099
 msgid "FAST VP Enabler is not installed. Can't set tiering policy for the volume"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2467
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2460
 #, python-format
 msgid "Failed to create snapshot of %s because it is a snapshot mount point."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2560
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2553
 #, python-format
 msgid "Failed to clone %s because it is a snapshot mount point."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2673
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2666
 #, python-format
 msgid ""
 "Failed to create consistency group %s because VNX consistency group "
 "cannot accept compressed LUNs as members."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2679
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2672
 #, python-format
 msgid ""
 "Failed to create consistency group %s because VNX consistency group "
 "cannot enable copytype:snap=True on its members."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2869
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2862
 #, python-format
 msgid "Host %s has no iSCSI initiator"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:2880
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:2873
 #, python-format
 msgid "Host %s has no FC initiators"
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3169
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3162
 #, python-format
 msgid ""
 "Reach limitation set by configuration option max_luns_per_storage_group. "
 "Operation to add %(vol)s into Storage Group %(sg)s is rejected."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3185
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3178
 #, python-format
 msgid "Failed to add %(vol)s into %(sg)s after %(retries)s tries."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3379
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3410
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3371
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3402
 msgid "Reference must contain source-id or source-name key."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3384
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3376
 #, python-format
 msgid ""
 "The imported lun %(lun_id)s is in pool %(lun_pool)s which is not managed "
 "by the host %(host)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3468
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3460
 #: cinder/volume/drivers/emc/xtremio.py:589
 #: cinder/volume/drivers/san/hp/hp_3par_common.py:428
 msgid ""
@@ -5758,24 +5767,24 @@ msgid ""
 " sources cannot be used."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3583
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3575
 #, python-format
 msgid "Failed to find storage pool for source volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3590
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3582
 #, python-format
 msgid ""
 "The source volume %s is not in the pool which is managed by the current "
 "host."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3739
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3731
 #, python-format
 msgid "Migrate volume failed between source vol %(src)s and dest vol %(dst)s."
 msgstr ""
 
-#: cinder/volume/drivers/emc/emc_vnx_cli.py:3845
+#: cinder/volume/drivers/emc/emc_vnx_cli.py:3838
 #, python-format
 msgid "Migrate volume %(src)s failed."
 msgstr ""
@@ -6365,23 +6374,17 @@ msgstr ""
 msgid "create_volume_from_snapshot: Snapshot %(name)s does not exist."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:490
-#: cinder/volume/drivers/huawei/rest_client.py:258
-#, python-format
-msgid "Can't find lun info on the array, lun name is: %(name)s."
-msgstr ""
-
-#: cinder/volume/drivers/huawei/huawei_driver.py:680
+#: cinder/volume/drivers/huawei/huawei_driver.py:672
 #, python-format
 msgid "Can't find cache name on the array, cache name is: %(name)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:692
+#: cinder/volume/drivers/huawei/huawei_driver.py:684
 #, python-format
 msgid "Can't find partition name on the array, partition name is: %(name)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:785
+#: cinder/volume/drivers/huawei/huawei_driver.py:777
 #, python-format
 msgid ""
 "An error occurred during the LUNcopy operation. LUNcopy name: "
@@ -6389,7 +6392,7 @@ msgid ""
 "%(luncopystate)s."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/huawei_driver.py:1081
+#: cinder/volume/drivers/huawei/huawei_driver.py:1075
 msgid "Can not add FC initiator to host."
 msgstr ""
 
@@ -6456,51 +6459,56 @@ msgstr ""
 msgid "Create volume error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:198
+#: cinder/volume/drivers/huawei/rest_client.py:196
 msgid "Delete lun error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:203
+#: cinder/volume/drivers/huawei/rest_client.py:201
 msgid "Query resource pool error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:235
+#: cinder/volume/drivers/huawei/rest_client.py:233
 msgid "Get volume by name error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:243
+#: cinder/volume/drivers/huawei/rest_client.py:241
 msgid "Activate snapshot error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:271
+#: cinder/volume/drivers/huawei/rest_client.py:265
 msgid "Create snapshot error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:292
+#: cinder/volume/drivers/huawei/rest_client.py:275
+#, python-format
+msgid "Can't find lun info on the array, lun name is: %(name)s."
+msgstr ""
+
+#: cinder/volume/drivers/huawei/rest_client.py:294
 msgid "Stop snapshot error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:298
+#: cinder/volume/drivers/huawei/rest_client.py:300
 msgid "Delete snapshot error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:304
+#: cinder/volume/drivers/huawei/rest_client.py:305
 msgid "Get snapshot id error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:322
+#: cinder/volume/drivers/huawei/rest_client.py:323
 msgid "Create luncopy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:347
+#: cinder/volume/drivers/huawei/rest_client.py:348
 msgid "Find portgroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:349
+#: cinder/volume/drivers/huawei/rest_client.py:350
 msgid "Can not find the portgroup on the array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:361
+#: cinder/volume/drivers/huawei/rest_client.py:362
 msgid "Associate portgroup to mapping view error."
 msgstr ""
 
@@ -6508,339 +6516,339 @@ msgstr ""
 msgid "Check portgroup associate error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:442
+#: cinder/volume/drivers/huawei/rest_client.py:438
 msgid "Get iSCSI target port error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:452
+#: cinder/volume/drivers/huawei/rest_client.py:448
 msgid "Get hostgroup information error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:460
+#: cinder/volume/drivers/huawei/rest_client.py:456
 msgid "Get lungroup information error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:485
+#: cinder/volume/drivers/huawei/rest_client.py:481
 #, python-format
 msgid "Failed to create hostgroup: %(name)s. Check if it exists on the array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:506
+#: cinder/volume/drivers/huawei/rest_client.py:502
 msgid "Create hostgroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:520
+#: cinder/volume/drivers/huawei/rest_client.py:516
 msgid "Create lungroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:529
+#: cinder/volume/drivers/huawei/rest_client.py:525
 msgid "Delete lungroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:536
-#: cinder/volume/drivers/huawei/rest_client.py:658
+#: cinder/volume/drivers/huawei/rest_client.py:532
+#: cinder/volume/drivers/huawei/rest_client.py:653
 msgid "Check lungroup associate error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:549
-#: cinder/volume/drivers/huawei/rest_client.py:642
+#: cinder/volume/drivers/huawei/rest_client.py:545
+#: cinder/volume/drivers/huawei/rest_client.py:637
 msgid "Check hostgroup associate error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:561
+#: cinder/volume/drivers/huawei/rest_client.py:557
 msgid "Find host lun id error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:582
+#: cinder/volume/drivers/huawei/rest_client.py:577
 msgid "Find host in hostgroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:606
+#: cinder/volume/drivers/huawei/rest_client.py:601
 #, python-format
 msgid "Failed to create host: %(name)s. Please check if it exists on the array."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:630
+#: cinder/volume/drivers/huawei/rest_client.py:625
 msgid "Add new host error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:673
+#: cinder/volume/drivers/huawei/rest_client.py:668
 msgid "Associate host to hostgroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:683
+#: cinder/volume/drivers/huawei/rest_client.py:678
 msgid "Associate lun to lungroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:692
+#: cinder/volume/drivers/huawei/rest_client.py:687
 msgid "Delete associated lun from lungroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:699
+#: cinder/volume/drivers/huawei/rest_client.py:694
 msgid "Check initiator added to array error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:712
+#: cinder/volume/drivers/huawei/rest_client.py:707
 msgid "Check initiator associated to host error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:728
+#: cinder/volume/drivers/huawei/rest_client.py:723
 msgid "Add initiator to array error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:739
+#: cinder/volume/drivers/huawei/rest_client.py:734
 msgid "Associate initiator to host error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:780
+#: cinder/volume/drivers/huawei/rest_client.py:775
 msgid "Invalid ALUA value. ALUA value must be 1 or 0."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:803
+#: cinder/volume/drivers/huawei/rest_client.py:798
 msgid ""
 "Use CHAP to associate initiator to host error. Please check the CHAP "
 "username and password."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:815
+#: cinder/volume/drivers/huawei/rest_client.py:810
 msgid "Use ALUA to associate initiator to host error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:825
+#: cinder/volume/drivers/huawei/rest_client.py:820
 msgid "Remove CHAP error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:833
+#: cinder/volume/drivers/huawei/rest_client.py:827
 msgid "Find mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:842
+#: cinder/volume/drivers/huawei/rest_client.py:836
 msgid "Add mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:853
+#: cinder/volume/drivers/huawei/rest_client.py:847
 msgid "Associate host to mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:864
+#: cinder/volume/drivers/huawei/rest_client.py:858
 msgid "Associate lungroup to mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:874
+#: cinder/volume/drivers/huawei/rest_client.py:868
 msgid "Delete lungroup from mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:886
+#: cinder/volume/drivers/huawei/rest_client.py:880
 msgid "Delete hostgroup from mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:897
+#: cinder/volume/drivers/huawei/rest_client.py:891
 msgid "Delete portgroup from mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:903
+#: cinder/volume/drivers/huawei/rest_client.py:897
 msgid "Delete mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:911
+#: cinder/volume/drivers/huawei/rest_client.py:905
 msgid "Find lun number error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:923
+#: cinder/volume/drivers/huawei/rest_client.py:917
 msgid "Find portgroup from mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:936
+#: cinder/volume/drivers/huawei/rest_client.py:930
 msgid "Find lun group from mapping view error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:951
+#: cinder/volume/drivers/huawei/rest_client.py:945
 msgid "Start LUNcopy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:972
+#: cinder/volume/drivers/huawei/rest_client.py:965
 msgid "Get LUNcopy information error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:989
+#: cinder/volume/drivers/huawei/rest_client.py:982
 msgid "Delete LUNcopy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1014
+#: cinder/volume/drivers/huawei/rest_client.py:1007
 msgid "Get connected free FC wwn error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1032
+#: cinder/volume/drivers/huawei/rest_client.py:1025
 msgid "Add FC port to host error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1039
+#: cinder/volume/drivers/huawei/rest_client.py:1032
 msgid "Get iSCSI port information error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1056
+#: cinder/volume/drivers/huawei/rest_client.py:1049
 msgid ""
 "Get iSCSI port info error, please check the target IP configured in "
 "huawei conf file."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1087
+#: cinder/volume/drivers/huawei/rest_client.py:1080
 msgid "Get FC target wwpn error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1102
+#: cinder/volume/drivers/huawei/rest_client.py:1095
 msgid "Invalid resource pool name. Please check the config file."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1137
+#: cinder/volume/drivers/huawei/rest_client.py:1130
 msgid "Get QoS policy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1158
+#: cinder/volume/drivers/huawei/rest_client.py:1151
 msgid "Update QoS policy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1166
+#: cinder/volume/drivers/huawei/rest_client.py:1159
 msgid "Get target IP error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1208
+#: cinder/volume/drivers/huawei/rest_client.py:1201
 #, python-format
 msgid ""
 "get_iscsi_params: Failed to get target IP for initiator %(ini)s, please "
 "check config file."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1272
+#: cinder/volume/drivers/huawei/rest_client.py:1265
 msgid "Create QoS policy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1283
+#: cinder/volume/drivers/huawei/rest_client.py:1276
 msgid "Delete QoS policy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1297
+#: cinder/volume/drivers/huawei/rest_client.py:1290
 msgid "Activate or deactivate QoS error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1305
-#: cinder/volume/drivers/huawei/rest_client.py:1505
+#: cinder/volume/drivers/huawei/rest_client.py:1296
+#: cinder/volume/drivers/huawei/rest_client.py:1488
 msgid "Get QoS information error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1330
+#: cinder/volume/drivers/huawei/rest_client.py:1321
 msgid "Remove lun from Qos error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1342
+#: cinder/volume/drivers/huawei/rest_client.py:1333
 msgid "Change lun priority error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1353
+#: cinder/volume/drivers/huawei/rest_client.py:1344
 msgid "Change lun smarttier policy error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1362
+#: cinder/volume/drivers/huawei/rest_client.py:1350
 msgid "Get QoS id by lun id error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1372
+#: cinder/volume/drivers/huawei/rest_client.py:1360
 msgid "Get lungroup id by lun id error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1387
+#: cinder/volume/drivers/huawei/rest_client.py:1373
 msgid "Get volume error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1399
+#: cinder/volume/drivers/huawei/rest_client.py:1385
 msgid "Extend volume error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1414
+#: cinder/volume/drivers/huawei/rest_client.py:1400
 msgid "Create lun migration error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1421
+#: cinder/volume/drivers/huawei/rest_client.py:1407
 msgid "Get lun migration task error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1427
+#: cinder/volume/drivers/huawei/rest_client.py:1413
 msgid "Delete lun migration error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1434
+#: cinder/volume/drivers/huawei/rest_client.py:1420
 msgid "Get partition by name error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1449
+#: cinder/volume/drivers/huawei/rest_client.py:1432
 msgid "Get partition by partition id error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1459
+#: cinder/volume/drivers/huawei/rest_client.py:1442
 msgid "Add lun to partition error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1466
+#: cinder/volume/drivers/huawei/rest_client.py:1449
 msgid "Remove lun from partition error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1471
+#: cinder/volume/drivers/huawei/rest_client.py:1454
 msgid "Get cache by name error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1485
+#: cinder/volume/drivers/huawei/rest_client.py:1468
 msgid "Get smartcache by cache id error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1497
+#: cinder/volume/drivers/huawei/rest_client.py:1480
 msgid "Remove lun from cache error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1539
+#: cinder/volume/drivers/huawei/rest_client.py:1522
 msgid "Associate lun to Qos error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1551
+#: cinder/volume/drivers/huawei/rest_client.py:1534
 msgid "Add lun to cache error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1556
+#: cinder/volume/drivers/huawei/rest_client.py:1539
 msgid "Find array version error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1562
+#: cinder/volume/drivers/huawei/rest_client.py:1545
 msgid "Remove host from array error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1567
+#: cinder/volume/drivers/huawei/rest_client.py:1550
 msgid "Delete hostgroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1575
+#: cinder/volume/drivers/huawei/rest_client.py:1558
 msgid "Remove host from hostgroup error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1582
+#: cinder/volume/drivers/huawei/rest_client.py:1565
 msgid "Remove iscsi from host error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1631
+#: cinder/volume/drivers/huawei/rest_client.py:1608
 msgid "Rename lun on array error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1653
+#: cinder/volume/drivers/huawei/rest_client.py:1630
 msgid "Remove fc from host error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1659
+#: cinder/volume/drivers/huawei/rest_client.py:1635
 msgid "Get host initiators info failed."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1683
+#: cinder/volume/drivers/huawei/rest_client.py:1657
 msgid "Add fc initiator to array error."
 msgstr ""
 
-#: cinder/volume/drivers/huawei/rest_client.py:1695
+#: cinder/volume/drivers/huawei/rest_client.py:1669
 msgid "Get FC ports from array error."
 msgstr ""
 
@@ -7740,21 +7748,21 @@ msgid ""
 "%(storage_family)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:74
+#: cinder/volume/drivers/netapp/utils.py:75
 #, python-format
 msgid "Configuration value %s is not set."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:189
+#: cinder/volume/drivers/netapp/utils.py:190
 #, python-format
 msgid "Unrecognized QOS keyword: \"%s\""
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:194
+#: cinder/volume/drivers/netapp/utils.py:195
 msgid "Only one limit can be set in a QoS spec."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/utils.py:299
+#: cinder/volume/drivers/netapp/utils.py:325
 #, python-format
 msgid ""
 "Conflicting QoS specifications in volume type %s: when QoS spec is "
@@ -7762,29 +7770,37 @@ msgid ""
 "allowed in the volume type extra specs."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:105
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:104
 #: cinder/volume/drivers/netapp/dataontap/nfs_7mode.py:69
 msgid ""
 "Unsupported Data ONTAP version. Data ONTAP version 7.3.1 and above is "
 "supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:109
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:108
 msgid "API version could not be determined."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:117
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:191
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:114
+#: cinder/volume/drivers/netapp/dataontap/block_cmode.py:83
+#: cinder/volume/drivers/netapp/eseries/library.py:204
+msgid ""
+"No pools are available for provisioning volumes. Ensure that the "
+"configuration option netapp_pool_name_search_pattern is set correctly."
+msgstr ""
+
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:124
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:198
 msgid "Data ONTAP operating in 7-Mode does not support QoS policy groups."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:364
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:400
 msgid ""
 "Setting LUN QoS policy group is not supported on this storage family and "
 "ONTAP version."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:372
+#: cinder/volume/drivers/netapp/dataontap/block_7mode.py:408
 msgid ""
 "Back-end QoS specs are not supported on this storage family and ONTAP "
 "version."
@@ -7792,7 +7808,7 @@ msgstr ""
 
 #: cinder/volume/drivers/netapp/dataontap/block_base.py:188
 #: cinder/volume/drivers/netapp/dataontap/nfs_base.py:109
-#: cinder/volume/drivers/netapp/eseries/library.py:347
+#: cinder/volume/drivers/netapp/eseries/library.py:356
 msgid "Pool is not available in the volume host field."
 msgstr ""
 
@@ -7866,25 +7882,25 @@ msgstr ""
 msgid "Failed to get LUN target details for the LUN %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_cmode.py:135
+#: cinder/volume/drivers/netapp/dataontap/block_cmode.py:143
 #, python-format
 msgid "No cloned LUN named %s found on the filer"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_cmode.py:302
+#: cinder/volume/drivers/netapp/dataontap/block_cmode.py:332
 #, python-format
 msgid ""
 "LUN with given ref %(ref)s does not satisfy volume type. Ensure LUN "
 "volume with ssc features is present on vserver %(vs)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/block_cmode.py:335
+#: cinder/volume/drivers/netapp/dataontap/block_cmode.py:365
 #, python-format
 msgid "Invalid QoS specification detected while getting QoS policy for volume %s"
 msgstr ""
 
 #: cinder/volume/drivers/netapp/dataontap/nfs_7mode.py:73
-#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:559
+#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:568
 msgid "Data ONTAP API version could not be determined."
 msgstr ""
 
@@ -7932,16 +7948,16 @@ msgstr ""
 msgid "Volume type does not match for share %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:397
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:445
 #, python-format
 msgid "Unable to locate an SVM that is managing the IP address '%s'"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:467
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:515
 msgid "Source host details not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:523
+#: cinder/volume/drivers/netapp/dataontap/nfs_cmode.py:571
 #, python-format
 msgid "Converted to raw, but format is now %s."
 msgstr ""
@@ -7959,19 +7975,19 @@ msgstr ""
 msgid "No storage path found for export path %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:432
+#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:441
 #, python-format
 msgid "No interface found on cluster for ip %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:458
+#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:467
 #, python-format
 msgid ""
 "No volume on cluster with vserver %(vserver)s and junction path "
 "%(junction)s "
 msgstr ""
 
-#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:556
+#: cinder/volume/drivers/netapp/dataontap/client/client_cmode.py:565
 msgid "Unsupported Clustered Data ONTAP version."
 msgstr ""
 
@@ -8001,17 +8017,24 @@ msgid ""
 "%(min_version)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/client.py:399
+#: cinder/volume/drivers/netapp/eseries/client.py:356
+#, python-format
+msgid ""
+"E-series proxy API version %(current_version)s does not support this "
+"expansion API. The proxy version must be at at least %(min_version)s"
+msgstr ""
+
+#: cinder/volume/drivers/netapp/eseries/client.py:414
 #, python-format
 msgid "Failed to move LUN mapping.  Return code: %s"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/client.py:426
+#: cinder/volume/drivers/netapp/eseries/client.py:441
 #, python-format
 msgid "Host group with ref %s not found"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/client.py:436
+#: cinder/volume/drivers/netapp/eseries/client.py:451
 #, python-format
 msgid "Host group with name %s not found"
 msgstr ""
@@ -8062,93 +8085,93 @@ msgid ""
 "host (%s) has been exceeded."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:189
+#: cinder/volume/drivers/netapp/eseries/library.py:190
 msgid "Configured host type is not supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:223
+#: cinder/volume/drivers/netapp/eseries/library.py:232
 #, python-format
 msgid "Controller IP '%(host)s' could not be resolved: %(e)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:269
+#: cinder/volume/drivers/netapp/eseries/library.py:278
 #, python-format
 msgid ""
 "Failure in communication between web service and array. Waited %s "
 "seconds. Verify array configuration parameters."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:280
+#: cinder/volume/drivers/netapp/eseries/library.py:289
 #, python-format
 msgid "System %(id)s found with bad status - %(status)s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:288
+#: cinder/volume/drivers/netapp/eseries/library.py:297
 msgid "The volume label is required as input."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:300
+#: cinder/volume/drivers/netapp/eseries/library.py:309
 #, python-format
 msgid "Specified snapshot group with label %s could not be found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:314
+#: cinder/volume/drivers/netapp/eseries/library.py:323
 #, python-format
 msgid "No snapshot image found in snapshot group %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:370
+#: cinder/volume/drivers/netapp/eseries/library.py:379
 #, python-format
 msgid ""
 "Cannot create more than %(req)s volumes on the ESeries array when "
 "'netapp_enable_multiattach' is set to true."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:406
+#: cinder/volume/drivers/netapp/eseries/library.py:415
 #, python-format
 msgid "Pools %s does not exist"
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:440
+#: cinder/volume/drivers/netapp/eseries/library.py:449
 #, python-format
 msgid "Failure creating volume %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:494
+#: cinder/volume/drivers/netapp/eseries/library.py:503
 #, python-format
 msgid "Vol copy job for dest %s failed."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:656
+#: cinder/volume/drivers/netapp/eseries/library.py:665
 #, python-format
 msgid "Failed to get LUN target details for the LUN %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:798
+#: cinder/volume/drivers/netapp/eseries/library.py:807
 #, python-format
 msgid "No good iscsi portals found for %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:810
+#: cinder/volume/drivers/netapp/eseries/library.py:819
 #, python-format
 msgid "No good iscsi portal found in supplied list for %s."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:846
+#: cinder/volume/drivers/netapp/eseries/library.py:855
 #, python-format
 msgid "Host with ports %(ports)s not found."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:867
+#: cinder/volume/drivers/netapp/eseries/library.py:876
 #, python-format
 msgid "Host type %s not supported."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1219
+#: cinder/volume/drivers/netapp/eseries/library.py:1254
 msgid "Reference must contain either source-name or source-id element."
 msgstr ""
 
-#: cinder/volume/drivers/netapp/eseries/library.py:1226
+#: cinder/volume/drivers/netapp/eseries/library.py:1261
 msgid "Volume not found on configured storage pools."
 msgstr ""
 
@@ -8828,27 +8851,27 @@ msgstr ""
 msgid "Cannot create image of disk format: %s. Only vmdk disk format is accepted."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1125
+#: cinder/volume/drivers/vmware/vmdk.py:1135
 #, python-format
 msgid "Exception in _select_ds_for_volume: %s."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1243
+#: cinder/volume/drivers/vmware/vmdk.py:1253
 #, python-format
 msgid ""
 "Container format: %s is unsupported by the VMDK driver, only 'bare' is "
 "supported."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1315
+#: cinder/volume/drivers/vmware/vmdk.py:1325
 msgid "Upload to glance of attached volume is not supported."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:1773
+#: cinder/volume/drivers/vmware/vmdk.py:1783
 msgid "Volume cannot be restored since it contains snapshots."
 msgstr ""
 
-#: cinder/volume/drivers/vmware/vmdk.py:2092
+#: cinder/volume/drivers/vmware/vmdk.py:2102
 #, python-format
 msgid "Linked clone of source volume not supported in state: %s."
 msgstr ""
@@ -9615,22 +9638,22 @@ msgstr ""
 msgid "Failed removing connection for fabric=%(fabric)s: Error: %(err)s"
 msgstr ""
 
-#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:106
+#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:93
 #: cinder/zonemanager/drivers/cisco/cisco_fc_san_lookup_service.py:104
 msgid "Missing Fibre Channel SAN configuration param - fc_fabric_names"
 msgstr ""
 
-#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:143
+#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:131
 #, python-format
 msgid "SSH connection failed for %(fabric)s with error: %(err)s"
 msgstr ""
 
-#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:219
+#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:211
 #, python-format
-msgid "SSH Command failed with error '%(err)s' '%(command)s'"
+msgid "SSH Command failed with error: '%(err)s', Command: '%(command)s'"
 msgstr ""
 
-#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:250
+#: cinder/zonemanager/drivers/brocade/brcd_fc_san_lookup_service.py:236
 #: cinder/zonemanager/drivers/brocade/brcd_fc_zone_client_cli.py:372
 #, python-format
 msgid "Malformed nameserver string: %s"
diff --git a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
index e3b5b0f76..fed84ca30 100644
--- a/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
+++ b/cinder/locale/tr_TR/LC_MESSAGES/cinder.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cinder 7.0.0.0b4.dev130\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:18+0000\n"
+"POT-Creation-Date: 2015-09-24 21:13+0200\n"
 "PO-Revision-Date: 2015-09-16 08:16+0000\n"
 "Last-Translator: Andreas Jaeger <jaegerandi@gmail.com>\n"
 "Language-Team: Turkish (Turkey) (http://www.transifex.com/openstack/cinder/"
@@ -4896,10 +4896,6 @@ msgstr ""
 "SSH komutu '%(total_attempts)r' girişimden sonra başarısız oldu: "
 "'%(command)s'"
 
-#, python-format
-msgid "SSH Command failed with error '%(err)s' '%(command)s'"
-msgstr "SSH Komutu '%(err)s' hatasıyla başarısız oldu '%(command)s'"
-
 #, python-format
 msgid "SSH command injection detected: %(command)s"
 msgstr "SSH komut ekleme algılandı: %(command)s"