Imported Translations from Transifex

For more information about this automatic import see:
https://wiki.openstack.org/wiki/Translations/Infrastructure

Change-Id: Icf2291e9684341d4844e1077d40feac6461d83f9

doc/admin-guide-cloud/locale/admin-guide-cloud.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-27 06:07+0000\n"
+"POT-Creation-Date: 2015-04-28 06:07+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"
@@ -279,7 +279,7 @@ msgid "Boot from volume"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_blockstorage.xml:118(para)
-msgid "In some cases, you can store and run instances from inside volumes. For information, see the <link href=\"http://docs.openstack.org/user-guide/enduser/cli_nova_launch_instance_from_volume.html\">Launch an instance from a volume</link> section in the <link href=\"http://docs.openstack.org/user-guide/index.html\"><citetitle>OpenStack End User Guide</citetitle></link>."
+msgid "In some cases, you can store and run instances from inside volumes. For information, see the <link href=\"http://docs.openstack.org/user-guide/enduser/cli_nova_launch_instance_from_volume.html\">Launch an instance from a volume</link> section in the <link href=\"http://docs.openstack.org/user-guide/\"><citetitle>OpenStack End User Guide</citetitle></link>."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/ch_blockstorage.xml:139(title)
@@ -294,11 +294,11 @@ msgstr ""
 msgid "Once configured, you can use the <placeholder-1/> command to manage the volumes. This command enables you to create, delete, and verify volumes and determine targets and add iSCSI initiators to the system."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_blockstorage.xml:156(title)
+#: ./doc/admin-guide-cloud/ch_blockstorage.xml:158(title)
 msgid "Troubleshoot your installation"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/ch_blockstorage.xml:157(para)
+#: ./doc/admin-guide-cloud/ch_blockstorage.xml:159(para)
 msgid "This section provides useful tips to help you troubleshoot your Block Storage installation."
 msgstr ""
 
@@ -3095,11 +3095,11 @@ msgid "VMware NSX integration"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_arch.xml:269(para)
-msgid "OpenStack Networking uses the NSX plugin to integrate with an existing VMware vCenter deployment. When installed on the network nodes, the NSX plugin enables a NSX controller to centrally manage configuration settings and push them to managed network nodes. Network nodes are considered managed when they're added as hypervisors to the NSX controller."
+msgid "OpenStack Networking uses the NSX plug-in to integrate with an existing VMware vCenter deployment. When installed on the network nodes, the NSX plug-in enables a NSX controller to centrally manage configuration settings and push them to managed network nodes. Network nodes are considered managed when they're added as hypervisors to the NSX controller."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_arch.xml:275(para)
-msgid "The diagrams below depict some VMware NSX deployment examples. The first diagram illustrates the traffic flow between VMs on separate Compute nodes, and the second diagram between two VMs on a single Compute node. Note the placement of the VMware NSX plugin and the <systemitem class=\"service\">neutron-server</systemitem> service on the network node. The green arrow indicates the management relationship between the NSX controller and the network node."
+msgid "The diagrams below depict some VMware NSX deployment examples. The first diagram illustrates the traffic flow between VMs on separate Compute nodes, and the second diagram between two VMs on a single Compute node. Note the placement of the VMware NSX plug-in and the <systemitem class=\"service\">neutron-server</systemitem> service on the network node. The green arrow indicates the management relationship between the NSX controller and the network node."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_arch.xml:283(title)
@@ -3330,7 +3330,7 @@ msgstr ""
 msgid "Creates a local provider network:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:193(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:200(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:210(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:220(replaceable)
+#: ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:193(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:200(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:210(replaceable) ./doc/admin-guide-cloud/networking/section_networking_adv_features.xml:220(replaceable) ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:232(replaceable) ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:252(replaceable)
 msgid "NAME"
 msgstr ""
 
@@ -5435,7 +5435,7 @@ msgid "Configure OVS plug-in"
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-plugins.xml:84(para)
-msgid "If you use the Open vSwitch (OVS) plug-in in a deployment with multiple hosts, you must use either tunneling or vlans to isolate traffic from multiple networks. Tunneling is easier to deploy because it does not require that you configure VLANs on network switches."
+msgid "If you use the Open vSwitch (OVS) plug-in in a deployment with multiple hosts, you must use either tunneling or VLANs to isolate traffic from multiple networks. Tunneling is easier to deploy because it does not require that you configure VLANs on network switches."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/networking/section_networking_config-plugins.xml:88(para)
@@ -8805,7 +8805,7 @@ msgid "The conversion from notifications to events is driven by a configuration
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-events.xml:88(para)
-msgid "This includes descriptions of how to map fields in the notification body to Traits, and optional plugins for doing any programmatic translations (splitting a string, forcing case)."
+msgid "This includes descriptions of how to map fields in the notification body to Traits, and optional plug-ins for doing any programmatic translations (splitting a string, forcing case)."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/telemetry/section_telemetry-events.xml:91(para)
@@ -12020,6 +12020,38 @@ msgstr ""
 msgid "Migrating volumes that have snapshots are currently not allowed."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:7(title)
+msgid "Rate-limit volume copy bandwidth"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:8(para)
+msgid "When you create a new volume from an image or an existing volume, or when you upload a volume image to the Image Service, large data copy may stress disk and network bandwidth. To mitigate slow down of data access from the instances, OpenStack Block Storage supports rate-limiting of volume data copy bandwidth."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:15(title)
+msgid "Configure volume copy bandwidth limit"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:16(para)
+msgid "To configure the volume copy bandwidth limit, set the <placeholder-1/> option in the configuration groups for each back end in the <filename>cinder.conf</filename> file. This option takes the integer of maximum bandwidth allowed for volume data copy in byte per second. If this option is set to <literal>0</literal>, the rate-limit is disabled."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:23(para)
+msgid "While multiple volume data copy operations are running in the same back end, the specified bandwidth is divided to each copy."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:26(para)
+msgid "Example <filename>cinder.conf</filename> configuration file to limit volume copy bandwidth of <literal>lvmdriver-1</literal> up to 100 MiB/s:"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:35(para)
+msgid "This feature requires libcgroup to set up blkio cgroup for disk I/O bandwidth limit. The libcgroup is provided by the <package>cgroup-bin</package> package in Debian and Ubuntu, or by the <package>libcgroup-tools</package> package in Fedora, Red Hat Enterprise Linux, CentOS, openSUSE, and SUSE Linux Enterprise."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_ratelimit-volume-copy-bandwidth.xml:43(para)
+msgid "Some back ends which use remote file systems such as NFS are not supported by this feature."
+msgstr ""
+
 #: ./doc/admin-guide-cloud/blockstorage/section_ts_non_existent_vlun.xml:8(title)
 msgid "Non-existent VLUN"
 msgstr ""
@@ -12336,6 +12368,98 @@ msgstr ""
 msgid "This command also makes the Boolean persistent across reboots. Run this command on all client hosts that require access to GlusterFS volumes on an instance. This includes all compute nodes."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:11(title)
+msgid "Oversubscription in thin provisioning"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:12(para)
+msgid "OpenStack Block Storage enables you to choose a volume back end based on virtual capacities for thin provisioning using the oversubscription ratio."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:16(para)
+msgid "A reference implementation is provided for the default LVM driver. The illustration below uses the LVM driver as an example."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:19(title)
+msgid "Configure oversubscription settings"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:20(para)
+msgid "To support oversubscription in thin provisioning, a flag <placeholder-1/> is introduced into <filename>cinder.conf</filename>. This is a float representation of the oversubscription ratio when thin provisioning is involved. Default ratio is 20.0, meaning provisioned capacity can be 20 times of the total physical capacity. A ratio of 10.5 means provisioned capacity can be 10.5 times of the total physical capacity. A ratio of 1.0 means provisioned capacity cannot exceed the total physical capacity. A ratio lower than 1.0 is ignored and the default value is used instead."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:31(para)
+msgid "<placeholder-1/> can be configured for each back end when multiple-storage back ends are enabled. It is provided as a reference implementation and is used by the LVM driver. However, it is not a requirement for a driver to use this option from <filename>cinder.conf</filename>. <placeholder-2/> is for configuring a back end. For a driver that supports multiple pools per back end, it can report this ratio for each pool. The LVM driver does not support multiple pools."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:41(para)
+msgid "The existing <placeholder-1/> flag is used to prevent over provisioning. This flag represents the percentage of the back-end capacity that is reserved."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:44(para)
+msgid "There is a change on how <placeholder-1/> is used. It was measured against the free capacity in the past. Now it is measured against the total capacity."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:49(title)
+msgid "Capabilities"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:50(para)
+msgid "Drivers can report the following capabilities for a back end or a pool:"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:55(replaceable)
+msgid "PROVISIONED_CAPACITY"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:56(replaceable)
+msgid "MAX_RATIO"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:57(para)
+msgid "Where <replaceable>PROVISIONED_CAPACITY</replaceable> is the apparent allocated space indicating how much capacity has been provisioned and <replaceable>MAX_RATIO</replaceable> is the maximum oversubscription ratio. For the LVM driver, it is <placeholder-1/> in <filename> cinder.conf</filename>."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:64(para)
+msgid "Two capabilities are added here to allow a back end or pool to claim support for thin provisioning, or thick provisioning, or both."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:68(para)
+msgid "The LVM driver reports <placeholder-1/> and <placeholder-2/> if the <placeholder-3/> flag in <filename>cinder.conf </filename> is <literal>thin</literal>. Otherwise it reports <placeholder-4/> and <placeholder-5/>."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:76(title)
+msgid "Volume type extra specs"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:77(para)
+msgid "If volume type is provided as part of the volume creation request, it can have the following extra specs defined:"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:81(para)
+msgid "<literal>capabilities</literal> scope key before <literal>thin_provisioning_support</literal> and <literal> thick_provisioning_support</literal> is not required. So the following works too:"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:87(para)
+msgid "The above extra specs are used by the scheduler to find a back end that supports thin provisioning, thick provisioning, or both to match the needs of a specific volume type."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:92(title)
+msgid "Capacity filter"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:93(para)
+msgid "In the capacity filter, <literal>max_over_subscription_ratio </literal> is used when choosing a back end if <literal> thin_provisioning_support</literal> is True and <placeholder-1/> is greater than 1.0."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:99(title)
+msgid "Capacity weigher"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_over_subscription.xml:100(para)
+msgid "In the capacity weigher, virtual free capacity is used for ranking if <literal>thin_provisioning_support</literal> is True. Otherwise, real free capacity will be used as before."
+msgstr ""
+
 #: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:7(title)
 msgid "Consistency Groups"
 msgstr ""
@@ -12421,89 +12545,133 @@ msgid "Delete a consistency group."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:89(para)
-msgid "The following operations are not allowed if a volume is in a consistency group:"
+msgid "Modify a consistency group."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:93(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:92(para)
-msgid "Volume migration."
+msgid "Create a consistency group from the snapshot of another consistency group."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:96(para)
-msgid "Volume retype."
+msgid "The following operations are not allowed if a volume is in a consistency group:"
-msgstr ""
-
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:99(para)
-msgid "Volume deletion."
 msgstr ""
 
 #: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:100(para)
+msgid "Volume migration."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:103(para)
+msgid "Volume retype."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:106(para)
+msgid "Volume deletion."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:107(para)
 msgid "A consistency group has to be deleted as a whole with all the volumes."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:105(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:112(para)
 msgid "The following operations are not allowed if a volume snapshot is in a consistency group snapshot:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:110(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:117(para)
 msgid "Volume snapshot deletion."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:111(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:118(para)
 msgid "A consistency group snapshot has to be deleted as a whole with all the volume snapshots."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:116(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:123(para)
 msgid "The details of consistency group operations are shown in the following."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:118(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:125(para)
 msgid "Create a consistency group:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:124(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:131(para)
 msgid "The parameter <literal>volume-types</literal> is required. It can be a list of names or UUIDs of volume types separated by commas without spaces in between. For example, <literal> volumetype1,volumetype2,volumetype3.</literal>."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:140(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:147(para)
 msgid "Show a consistency group:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:152(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:159(para)
 msgid "List consistency groups:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:160(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:167(para)
 msgid "Create a volume and add it to a consistency group:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:161(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:168(para)
 msgid "When creating a volume and adding it to a consistency group, a volume type and a consistency group id must be provided. This is because a consistency group can support more than one volume type."
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:193(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:200(para)
 msgid "Create a snapshot for a consistency group:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:205(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:212(para)
 msgid "Show a snapshot of a consistency group:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:207(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:214(para)
 msgid "List consistency group snapshots:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:217(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:224(para)
 msgid "Delete a snapshot of a consistency group:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:219(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:226(para)
 msgid "Delete a consistency group:"
 msgstr ""
 
-#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:220(para)
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:227(para)
 msgid "The force flag is needed when there are volumes in the consistency group."
 msgstr ""
 
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:230(para)
+msgid "Modify a consistency group:"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:233(replaceable) ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:253(replaceable)
+msgid "DESCRIPTION"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:234(replaceable)
+msgid "UUID1,UUID2,......"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:235(replaceable)
+msgid "UUID3,UUID4,......"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:236(replaceable)
+msgid "CG"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:237(para)
+msgid "The parameter <replaceable>CG</replaceable> is required. It can be a name or UUID of a consistency group. <replaceable>UUID1,UUID2,......</replaceable> are UUIDs of one or more volumes to be added to the consistency group, separated by commas. Default is None. <replaceable>UUID3,UUId4,......</replaceable> are UUIDs of one or more volumes to be removed from the consistency group, separated by commas. Default is None."
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:247(para)
+msgid "Create a consistency group from the snapshot of another consistency group:"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:251(replaceable)
+msgid "CGSNAPSHOT"
+msgstr ""
+
+#: ./doc/admin-guide-cloud/blockstorage/section_consistency_groups.xml:254(para)
+msgid "The parameter <replaceable>CGSNAPSHOT</replaceable> is a name or UUID of a snapshot of a consistency group."
+msgstr ""
+
 #: ./doc/admin-guide-cloud/blockstorage/section_increase-api-throughput.xml:7(title)
 msgid "Increase Block Storage API service throughput"
 msgstr ""

doc/common/locale/fr.po

@@ -19,8 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-25 04:53+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-25 04:51+0000\n"
+"PO-Revision-Date: 2015-04-27 20:54+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openstack-manuals-"
 "i18n/language/fr/)\n"
@@ -2885,6 +2885,9 @@ msgstr "ERROR"
 msgid "[swift-constraints]"
 msgstr "[swift-constraints]"
 
+msgid "proxy-server.conf-sample"
+msgstr "proxy-server.conf-sample"
+
 msgid "SSH"
 msgstr "SSH"
 
@@ -3011,6 +3014,9 @@ msgstr "[heat_api]"
 msgid "[clients_ceilometer]"
 msgstr "[clients_ceilometer]"
 
+msgid "(StrOpt) File name of clean sqlite db"
+msgstr "(StrOpt) Nom de fichier de clean sqlite db"
+
 msgid ""
 "(BoolOpt) Treat X-Forwarded-For as the canonical remote address. Only enable "
 "this if you have a sanitizing proxy."

doc/common/locale/zh_CN.po

@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-25 04:53+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-25 04:51+0000\n"
+"PO-Revision-Date: 2015-04-27 20:33+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "openstack-manuals-i18n/language/zh_CN/)\n"
@@ -3753,9 +3753,6 @@ msgstr "nova"
 msgid "default_catalog.templates"
 msgstr "default_catalog.templates"
 
-msgid "linux_dm_mp"
-msgstr "linux_dm_mp"
-
 msgid "[ml2_fslsdn]"
 msgstr "[ml2_fslsdn]"
 

doc/config-reference/locale/config-reference.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-27 06:07+0000\n"
+"POT-Creation-Date: 2015-04-28 06:08+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"
@@ -2762,7 +2762,7 @@ msgstr ""
 msgid "Define a fabric group for each fabric using the fabric names used in <placeholder-1/> configuration option as group name."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/section_fc-zoning.xml:59(title) ./doc/config-reference/block-storage/section_fc-zoning.xml:98(title) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:15(title) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:16(title) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:42(title) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:13(title) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:13(title) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:23(title) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:25(title)
+#: ./doc/config-reference/block-storage/section_fc-zoning.xml:59(title) ./doc/config-reference/block-storage/section_fc-zoning.xml:98(title) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:15(title) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:16(title) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:42(title) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:13(title) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:23(title) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:25(title)
 msgid "System requirements"
 msgstr ""
 
@@ -2954,7 +2954,7 @@ msgstr ""
 msgid "The Huawei driver supports the iSCSI and Fibre Channel connections and enables OceanStor T series V200R002, OceanStor 18000 series V100R001 and OceanStor V3 series V300R002 storage to provide block storage services for OpenStack."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:9(title) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:168(title) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:24(title) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:17(title) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:92(title) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:16(title) ./doc/config-reference/block-storage/drivers/pure-storage-driver.xml:25(title) ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:15(title) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:93(title) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:66(title) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:316(title) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:39(title) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:56(title) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:18(title) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:40(title) ./doc/config-reference/block-storage/drivers/xio-volume-driver.xml:17(title) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:10(title) ./doc/config-reference/block-storage/drivers/emc-xtremio-driver.xml:21(title) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:35(title) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:232(title) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:16(title)
+#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:9(title) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:168(title) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:24(title) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:17(title) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:92(title) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:16(title) ./doc/config-reference/block-storage/drivers/pure-storage-driver.xml:25(title) ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:15(title) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:66(title) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:316(title) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:56(title) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:18(title) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:40(title) ./doc/config-reference/block-storage/drivers/xio-volume-driver.xml:17(title) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:10(title) ./doc/config-reference/block-storage/drivers/emc-xtremio-driver.xml:21(title) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:35(title) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:232(title) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:16(title)
 msgid "Supported operations"
 msgstr ""
 
@@ -2966,19 +2966,19 @@ msgstr ""
 msgid "Create and delete a snapshot."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:18(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:181(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:36(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:31(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:104(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:30(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:78(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:328(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:52(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:76(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:94(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:112(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:71(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:30(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:52(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:45(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:256(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:29(para)
+#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:18(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:181(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:36(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:31(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:104(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:30(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:78(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:328(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:71(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:30(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:52(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:45(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:256(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:29(para)
 msgid "Copy an image to a volume."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:21(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:184(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:34(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:107(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:33(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:81(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:331(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:55(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:79(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:97(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:115(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:68(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:33(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:48(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:269(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:32(para)
+#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:21(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:184(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:34(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:107(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:33(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:81(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:331(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:68(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:33(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:48(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:269(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:32(para)
 msgid "Copy a volume to an image."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:24(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:178(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:33(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:28(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:101(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:75(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:325(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:49(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:73(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:65(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:49(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:60(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:253(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:26(para)
+#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:24(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:178(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:33(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:28(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:101(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:75(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:325(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:65(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:49(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:60(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:253(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:26(para)
 msgid "Create a volume from a snapshot."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:187(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:42(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:37(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:110(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:36(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:84(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:58(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:82(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:74(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:36(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:55(para) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:18(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:51(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:284(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:35(para)
+#: ./doc/config-reference/block-storage/drivers/huawei-storage-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:187(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:42(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:37(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:110(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:36(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:84(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:74(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:36(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:55(para) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:18(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:51(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:284(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:35(para)
 msgid "Clone a volume."
 msgstr ""
 
@@ -3209,7 +3209,7 @@ msgstr ""
 msgid "Set the following in your <filename>cinder.conf</filename> to use the Nimble volume driver:"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/nimble-volume-driver.xml:18(para) ./doc/config-reference/block-storage/drivers/datera-volume-driver.xml:17(para) ./doc/config-reference/block-storage/drivers/fusionio-volume-driver.xml:18(para)
+#: ./doc/config-reference/block-storage/drivers/nimble-volume-driver.xml:18(para) ./doc/config-reference/block-storage/drivers/datera-volume-driver.xml:17(para)
 msgid "Use the following options to configure the volume driver:"
 msgstr ""
 
@@ -3385,26 +3385,6 @@ msgstr ""
 msgid "Set the following <literal>volume_driver</literal> in <filename>cinder.conf</filename>:"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/storpool-driver.xml:6(title)
-msgid "StorPool driver"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/storpool-driver.xml:7(para)
-msgid "StorPool is distributed data storage software running on standard x86 servers. StorPool aggregates the performance and capacity of all drives into a shared pool of storage distributed among the servers. Within this storage pool the user creates thin-provisioned volumes that are exposed to the clients as block devices. StorPool consists of two parts wrapped in one package - a server and a client. The StorPool server allows a hypervisor to act as a storage node, while the StorPool client allows a hypervisor node to access the storage pool and act as a compute node. In OpenStack terms the StorPool solution allows each hypervisor node to be both a storage and a compute node simultaneously. More information can be found on <link href=\"https://storpool.com/\">StorPool's homepage</link>."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/storpool-driver.xml:20(para)
-msgid "To make full use of StorPool's native network communication protocol, the Nova compute nodes will need to use the StorPool libvirt volume attachment driver, nova.virt.libvirt.storpool.LibvirtStorPoolVolumeDriver."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/storpool-driver.xml:24(para)
-msgid "To use Block Storage with StorPool, first set the <literal>volume_driver</literal> in <filename>cinder.conf</filename>:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/storpool-driver.xml:28(para)
-msgid "The following table contains the configuration options supported by the StorPool driver."
-msgstr ""
-
 #: ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:5(title)
 msgid "IBM FlashSystem volume driver"
 msgstr ""
@@ -3573,15 +3553,15 @@ msgstr ""
 msgid "These operations are supported:"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:172(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:95(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:69(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:319(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:43(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:67(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:88(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:106(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:21(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:43(para) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:12(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:237(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:20(para)
+#: ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:172(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:27(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:95(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:69(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:319(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:21(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:43(para) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:12(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:237(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:20(para)
 msgid "Create, delete, attach, and detach volumes."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:175(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:30(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:25(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:98(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:24(para) ./doc/config-reference/block-storage/drivers/pure-storage-driver.xml:34(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:72(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:322(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:46(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:70(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:91(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:109(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:24(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:46(para) ./doc/config-reference/block-storage/drivers/xio-volume-driver.xml:26(para) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:15(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:42(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:246(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:23(para)
+#: ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:175(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:30(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:25(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:98(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:24(para) ./doc/config-reference/block-storage/drivers/pure-storage-driver.xml:34(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:72(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:322(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:24(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:46(para) ./doc/config-reference/block-storage/drivers/xio-volume-driver.xml:26(para) ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:15(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:42(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:246(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:23(para)
 msgid "Create, list, and delete volume snapshots."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:190(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:45(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:40(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:113(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:87(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:61(para) ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:100(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:77(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:58(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:54(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:313(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:38(para)
+#: ./doc/config-reference/block-storage/drivers/ibm-flashsystem-volume-driver.xml:190(para) ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:45(para) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:40(para) ./doc/config-reference/block-storage/drivers/hp-3par-driver.xml:113(para) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:87(para) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:77(para) ./doc/config-reference/block-storage/drivers/prophetstor-dpl-driver.xml:39(para) ./doc/config-reference/block-storage/drivers/emc-vnx-direct-driver.xml:58(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:54(para) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:313(para) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:38(para)
 msgid "Extend a volume."
 msgstr ""
 
@@ -3714,7 +3694,7 @@ msgstr ""
 msgid "<emphasis>RBD and QEMU-RBD</emphasis>. Linux kernel and QEMU block devices that stripe data across multiple objects."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/ceph-rbd-volume-driver.xml:111(title) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:114(title) ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:202(title) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:123(title)
+#: ./doc/config-reference/block-storage/drivers/ceph-rbd-volume-driver.xml:111(title) ./doc/config-reference/block-storage/drivers/dell-storagecenter-driver.xml:114(title) ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:202(title)
 msgid "Driver options"
 msgstr ""
 
@@ -3766,7 +3746,7 @@ msgstr ""
 msgid "Platform: Ubuntu 12.04 LTS or newer."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:53(title) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:50(title) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:14(title) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:85(title) ./doc/config-reference/block-storage/drivers/xen-sm-driver.xml:134(title) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:35(title) ./doc/config-reference/compute/section_hypervisor_vmware.xml:257(td) ./doc/config-reference/compute/section_hypervisor_vmware.xml:323(td)
+#: ./doc/config-reference/block-storage/drivers/hds-hus-driver.xml:53(title) ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:50(title) ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:85(title) ./doc/config-reference/block-storage/drivers/xen-sm-driver.xml:134(title) ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:35(title) ./doc/config-reference/compute/section_hypervisor_vmware.xml:257(td) ./doc/config-reference/compute/section_hypervisor_vmware.xml:323(td)
 msgid "Configuration"
 msgstr ""
 
@@ -4410,98 +4390,6 @@ msgstr ""
 msgid "After configuring <systemitem class=\"service\">cinder-volume</systemitem> using the <filename>cinder.conf</filename> file, you may use the following commands to install and run the service (note that you must replace the variables with the proper paths):"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:4(title)
-msgid "Nexenta drivers"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:5(para)
-msgid "NexentaStor Appliance is NAS/SAN software platform designed for building reliable and fast network storage arrays. The Nexenta Storage Appliance uses ZFS as a disk management system. NexentaStor can serve as a storage node for the OpenStack and its virtual servers through iSCSI and NFS protocols."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:9(para)
-msgid "With the NFS option, every Compute volume is represented by a directory designated to be its own file system in the ZFS file system. These file systems are exported using NFS."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:12(para)
-msgid "With either option some minimal setup is required to tell OpenStack which NexentaStor servers are being used, whether they are supporting iSCSI and/or NFS and how to access each of the servers."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:16(para)
-msgid "Typically the only operation required on the NexentaStor servers is to create the containing directory for the iSCSI or NFS exports. For NFS this containing directory must be explicitly exported via NFS. There is no software that must be installed on the NexentaStor servers; they are controlled using existing management plane interfaces."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:24(title)
-msgid "Nexenta iSCSI driver"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:25(para)
-msgid "The Nexenta iSCSI driver allows you to use a NexentaStor appliance to store Compute volumes. Every Compute volume is represented by a single zvol in a predefined Nexenta namespace. For every new volume the driver creates a iSCSI target and iSCSI target group that are used to access it from compute hosts."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:29(para)
-msgid "The Nexenta iSCSI volume driver should work with all versions of NexentaStor. The NexentaStor appliance must be installed and configured according to the relevant Nexenta documentation. A pool and an enclosing namespace must be created for all iSCSI volumes to be accessed through the volume driver. This should be done as specified in the release specific NexentaStor documentation."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:36(para)
-msgid "The NexentaStor Appliance iSCSI driver is selected using the normal procedures for one or multiple back-end volume drivers. You must configure these items for each NexentaStor appliance that the iSCSI volume driver controls:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:42(title)
-msgid "Enable the Nexenta iSCSI driver and related options"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:44(para)
-msgid "This table contains the options supported by the Nexenta iSCSI driver."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:48(para)
-msgid "To use Compute with the Nexenta iSCSI driver, first set the <code>volume_driver</code>:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:52(para)
-msgid "Then, set the <code>nexenta_host</code> parameter and other parameters from the table, if needed."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:59(title)
-msgid "Nexenta NFS driver"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:60(para)
-msgid "The Nexenta NFS driver allows you to use NexentaStor appliance to store Compute volumes via NFS. Every Compute volume is represented by a single NFS file within a shared directory."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:64(para)
-msgid "While the NFS protocols standardize file access for users, they do not standardize administrative actions such as taking snapshots or replicating file systems. The OpenStack Volume Drivers bring a common interface to these operations. The Nexenta NFS driver implements these standard actions using the ZFS management plane that already is deployed on NexentaStor appliances."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:71(para)
-msgid "The Nexenta NFS volume driver should work with all versions of NexentaStor. The NexentaStor appliance must be installed and configured according to the relevant Nexenta documentation. A single-parent file system must be created for all virtual disk directories supported for OpenStack. This directory must be created and exported on each NexentaStor appliance. This should be done as specified in the release specific NexentaStor documentation."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:78(title)
-msgid "Enable the Nexenta NFS driver and related options"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:80(para)
-msgid "To use Compute with the Nexenta NFS driver, first set the <code>volume_driver</code>:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:85(para)
-msgid "The following table contains the options supported by the Nexenta NFS driver."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:89(para)
-msgid "Add your list of Nexenta NFS servers to the file you specified with the <code>nexenta_shares_config</code> option. For example, if the value of this option was set to <filename>/etc/cinder/nfs_shares</filename>, then:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:98(para)
-msgid "Comments are allowed in this file. They begin with a <code>#</code>."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/nexenta-volume-driver.xml:100(para)
-msgid "Each line in this file represents a NFS share. The first part of the line is the NFS share URL, the second is the connection URL to the NexentaStor Appliance."
-msgstr ""
-
 #: ./doc/config-reference/block-storage/drivers/scality-sofs-driver.xml:6(title)
 msgid "Scality SOFS driver"
 msgstr ""
@@ -4698,7 +4586,7 @@ msgstr ""
 msgid "Create, extend, delete volumes"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:21(para) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:111(para)
+#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:21(para)
 msgid "Attach and detach volumes"
 msgstr ""
 
@@ -4810,15 +4698,15 @@ msgstr ""
 msgid "Define the following required properties in the <filename>cinder.conf</filename> configuration file:"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:174(replaceable) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:69(replaceable)
+#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:174(replaceable)
 msgid "myhost"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:175(replaceable) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:70(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:81(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:145(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:353(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:410(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:489(replaceable)
+#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:175(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:81(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:145(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:353(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:410(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:489(replaceable)
 msgid "username"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:176(replaceable) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:71(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:82(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:146(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:354(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:411(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:490(replaceable) ./doc/config-reference/image-service/section_image-service-backend-vmware.xml:59(replaceable)
+#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:176(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:82(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:146(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:354(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:411(replaceable) ./doc/config-reference/block-storage/drivers/netapp-volume-driver.xml:490(replaceable) ./doc/config-reference/image-service/section_image-service-backend-vmware.xml:59(replaceable)
 msgid "password"
 msgstr ""
 
@@ -4826,7 +4714,7 @@ msgstr ""
 msgid "mydata"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:178(replaceable) ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:72(replaceable)
+#: ./doc/config-reference/block-storage/drivers/zfssa-nfs-driver.xml:178(replaceable)
 msgid "mypool"
 msgstr ""
 
@@ -4862,110 +4750,6 @@ msgstr ""
 msgid "This driver shares additional NFS configuration options with the generic NFS driver. For a description of these, see <xref linkend=\"config_table_cinder_storage_nfs\"/>."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:5(title)
-msgid "Oracle ZFSSA iSCSI Driver"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:6(para)
-msgid "Oracle ZFS Storage Appliances (ZFSSAs) provide advanced software to protect data, speed tuning and troubleshooting, and deliver high performance and high availability. Through the Oracle ZFSSA iSCSI Driver, OpenStack Block Storage can use an Oracle ZFSSA as a block storage resource. The driver enables you to create iSCSI volumes that an OpenStack Block Storage server can allocate to any virtual machine running on a compute host. The Oracle ZFSSA iSCSI Driver, version <literal>1.0.0</literal>, supports ZFSSA software release <literal>2013.1.2.0</literal> and later."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:17(para)
-msgid "Enable RESTful service on the ZFSSA Storage Appliance."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:20(para)
-msgid "Create a new user on the appliance with the following authorizations:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:23(code)
-msgid "scope=stmf - allow_configure=true"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:26(code)
-msgid "scope=nas - allow_clone=true, allow_createProject=true, allow_createShare=true, allow_changeSpaceProps=true, allow_changeGeneralProps=true, allow_destroy=true, allow_rollback=true, allow_takeSnap=true"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:29(para)
-msgid "You can create a role with authorizations as follows:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:41(para)
-msgid "You can create a user with a specific role as follows:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:49(para)
-msgid "You can also run this <link href=\"https://java.net/projects/solaris-userland/sources/gate/content/components/openstack/cinder/files/zfssa/cinder.akwf?rev=2047\">workflow</link> to automate the above tasks."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:55(para)
-msgid "Ensure that the ZFSSA iSCSI service is online. If the ZFSSA iSCSI service is not online, enable the service by using the BUI, CLI or REST API in the appliance."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:67(para)
-msgid "Define the following required properties in the <filename>cinder.conf</filename> file:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:73(replaceable)
-msgid "myproject"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:74(replaceable) ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:243(literal)
-msgid "default"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:75(replaceable)
-msgid "w.x.y.z:3260"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:76(replaceable)
-msgid "e1000g0"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:77(para)
-msgid "Optionally, you can define additional properties."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:78(para)
-msgid "Target interfaces can be seen as follows in the CLI:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:86(para)
-msgid "Do not use management interfaces for <code>zfssa_target_interfaces</code>."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:96(para)
-msgid "Create and delete volumes"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:99(para)
-msgid "Extend volume"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:102(para)
-msgid "Create and delete snapshots"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:105(para)
-msgid "Create volume from snapshot"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:108(para)
-msgid "Delete volume snapshots"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:114(para)
-msgid "Get volume stats"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:117(para)
-msgid "Clone volumes"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zfssa-volume-driver.xml:124(para)
-msgid "The Oracle ZFSSA iSCSI Driver supports these options:"
-msgstr ""
-
 #: ./doc/config-reference/block-storage/drivers/hp-lefthand-driver.xml:4(title)
 msgid "HP LeftHand/StoreVirtual driver"
 msgstr ""
@@ -5170,258 +4954,6 @@ msgstr ""
 msgid "Add server associations on the VSA with the associated CHAPS and initiator information. The name should correspond to the <literal>hostname</literal> of the <literal>nova-compute</literal> node. For Xen, this is the hypervisor host name. To do this, use either CLIQ or the Centralized Management Console."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:7(title)
-msgid "FUJITSU ETERNUS DX iSCSI and FC drivers"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:8(para)
-msgid "The driver runs volume operations by communicating with the back-end FUJITSU storage. It uses a CIM client in Python called PyWBEM to perform CIM operations over HTTP."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:14(para)
-msgid "Supported ETERNUS DX storage systems"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:17(para)
-msgid "ETERNUS DX80 S2/DX90 S2"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:20(para)
-msgid "ETERNUS DX410 S2/DX440 S2"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:23(para)
-msgid "ETERNUS DX8100 S2/DX8700 S2"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:26(para)
-msgid "ETERNUS DX100 S3/DX200 S3 (*1)"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:29(para)
-msgid "ETERNUS DX500 S3/DX600 S3 (*1)"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:32(para)
-msgid "ETERNUS DX200F (*1)"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:35(para)
-msgid "*1: Applying the firmware version V10L2x is required."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:40(para)
-msgid "ETERNUS DX S3 with Thin Provisioning Pool support these operations:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:64(para)
-msgid "ETERNUS DX S3 with RAID Group support these operations:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:85(para)
-msgid "ETERNUS DX S2 with Thin Provisioning Pool support these operations:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:103(para)
-msgid "ETERNUS DX S2 with RAID Group support these operations:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:120(title)
-msgid "Set up the ETERNUS DX drivers"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:124(title) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:106(title)
-msgid "Install the <package>python-pywbem</package> package"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:125(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:108(para)
-msgid "Install the <package>python-pywbem</package> package for your distribution, as follows:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:129(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:112(para)
-msgid "On Ubuntu:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:133(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:116(para)
-msgid "On openSUSE:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:137(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:120(para)
-msgid "On Fedora:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:143(title)
-msgid "Adjust the SMI-S settings for the ETERNUS DX"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:144(para)
-msgid "The SMI-S of the ETERNUS DX must be enabled in advance. Enable the SMI-S of the ETERNUS DX by using ETERNUS Web GUI or ETERNUS CLI. For more details on this procedure, refer to the ETERNUS Web GUI manuals or the ETERNUS CLI manuals."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:151(para)
-msgid "The SMI-S is enabled after the ETERNUS DX is rebooted."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:157(title)
-msgid "Create an account"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:158(para)
-msgid "To access the ETERNUS DX via SMI-S, a user account with <literal>Admin</literal>, <literal>Storage Admin</literal>, <literal>Maintainer</literal>, or <literal>Software</literal> as a user level is required. Use ETERNUS Web GUI or ETERNUS CLI to register the user account in the ETERNUS DX. For more details on the registration procedure, refer to the ETERNUS Web GUI manuals or the ETERNUS CLI manuals."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:169(title)
-msgid "Create the storage pool"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:170(para)
-msgid "Create a storage pool for creating volumes in advance. A RAID group or a Thin Provisioning Pool can be specified for the storage pool. Use ETERNUS Web GUI or ETERNUS CLI to create a RAID group or a Thin Provisioning Pool in the ETERNUS DX. For more details on the creation procedure, refer to the ETERNUS Web GUI manuals or the ETERNUS CLI manuals."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:181(title)
-msgid "ETERNUS ports settings"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:182(para)
-msgid "When the CA port is used, change the following host interface port parameters by using the relevant commands from the ETERNUS CLI."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:189(para)
-msgid "Change the port mode to \"CA\". Use the <placeholder-1/> command to change the port mode."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:195(para)
-msgid "Enable the host affinity setting. Use the <placeholder-1/> command to change the host affinity setting."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:201(para)
-msgid "Example: For FC ports"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:203(para)
-msgid "Example: For iSCSI ports"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:207(title)
-msgid "Register licenses to the ETERNUS DX"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:208(para)
-msgid "An Advanced Copy Feature license is required to create snapshots or create volumes from snapshots. Purchase this license separately and register the license in the ETERNUS DX. Note that the Advanced Copy table size setting is also required. For details on registering and configuring the Advanced Copy function, refer to the ETERNUS Web GUI manuals."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:219(title)
-msgid "Enable the Snap Data Pool"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:220(para)
-msgid "SnapOPC is used for the SnapShot function of the ETERNUS OpenStack VolumeDriver. Since Snap Data Pool (SDP) is required for SnapOPC, create an SDPV and enable the SDP. For more details, refer to the ETERNUS Web GUI manuals or the ETERNUS CLI manuals."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:229(title)
-msgid "SAN connection"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:230(para)
-msgid "FC and iSCSI can be used as a host interface. The compute node of OpenStack and the ETERNUS DX must be connected to the SAN and be available for communication in advance. To use Fibre Channel switches, zoning settings for the Fibre Channel switches are also required. To use the iSCSI connections, logging in to the iSCSI target is required. The host affinity mode for all of the host interface ports of the ETERNUS DX must also be enabled in advance. For more details, refer to the ETERNUS Web GUI manuals or the ETERNUS CLI manuals."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:245(title)
-msgid "Update <filename>cinder.conf</filename> configuration file"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:247(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:159(para)
-msgid "Make the following changes in <filename>/etc/cinder/cinder.conf</filename>."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:249(para)
-msgid "For iSCSI driver, add the following entries, where <literal>10.2.2.2</literal> is the IP address of the ETERNUS DX iSCSI target:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:256(para)
-msgid "For FC driver, add the following entries:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:259(para)
-msgid "Restart the <systemitem class=\"service\">cinder-volume</systemitem> service."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:262(title)
-msgid "Create <filename>cinder_fujitsu_eternus_dx.xml</filename> configuration file"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:264(para)
-msgid "Create the <filename>/etc/cinder/cinder_fujitsu_eternus_dx.xml</filename> file. You do not need to restart the service for this change."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:266(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:207(para)
-msgid "Add the following lines to the XML file:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:278(para) ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:222(para)
-msgid "Where:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:281(para)
-msgid "<systemitem>StorageType</systemitem> is the thin pool from which the user wants to create the volume. Thin pools can be created using ETERNUS WebGUI. If the <literal>StorageType</literal> tag is not defined, you have to define volume types and set the pool name in extra specs."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:290(para)
-msgid "<systemitem>EcomServerIp</systemitem> is the IP address of the ETERNUS DX MNT port."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:294(para)
-msgid "<systemitem>EcomServerPort</systemitem> is the port number of the ETERNUS DX SMI-S port number."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:298(para)
-msgid "<systemitem>EcomUserName</systemitem> and <systemitem>EcomPassword</systemitem> are credentials for the ETERNUS DX."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:303(para)
-msgid "<systemitem>SnapPool</systemitem> is the thick pool(RAID Group) for create the snapshot. Thick pools can be created using ETERNUS WebGUI."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:309(para)
-msgid "<systemitem>Timeout</systemitem> specifies the maximum number of seconds you want to wait for an operation to finish."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:317(title)
-msgid "Volume type support"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:318(para)
-msgid "Volume type support enables a single instance of <systemitem>cinder-volume</systemitem> to support multiple pools and thick/thin provisioning."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:321(para)
-msgid "When the <literal>StorageType</literal> tag in <filename>cinder_fujitsu_eternus_dx.xml</filename> is used, the pool name is specified in the tag. Only thin provisioning is supported in this case."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:325(para)
-msgid "When the <literal>StorageType</literal> tag is not used in <filename>cinder_fujitsu_eternus_dx.xml</filename>, the volume type needs to be used to define a pool name and a provisioning type. The pool name is the name of a pre-created pool. The provisioning type could be either <literal>thin</literal> or <literal>thick</literal>."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:331(para)
-msgid "Here is an example of how to set up volume type. First create volume types. Then define extra specs for each volume type."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:336(para)
-msgid "Create the volume types:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:341(para)
-msgid "Setup the volume type extra specs:"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:348(para)
-msgid "In the above example, two volume types are created. They are <literal>High Performance</literal> and <literal> Standard Performance</literal>. For <literal>High Performance </literal>, <literal>storagetype:pool</literal> is set to <literal>smis_pool</literal> and <literal>storagetype:provisioning </literal> is set to <literal>thick</literal>. Similarly for <literal>Standard Performance</literal>, <literal> storagetype:pool</literal>. is set to <literal>smis_pool2</literal> and <literal>storagetype:provisioning</literal> is set to <literal>thin</literal>. If <literal>storagetype:provisioning </literal> is not specified, it will default to <literal> thin</literal>."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/fujitsu-dx-volume-driver.xml:360(para)
-msgid "Volume type names <literal>High Performance</literal> and <literal>Standard Performance</literal> are user-defined and can be any names. Extra spec keys <literal>storagetype:pool</literal> and <literal>storagetype:provisioning</literal> have to be the exact names listed here. Extra spec value <literal>smis_pool </literal> is your pool name. The extra spec value for <literal>storagetype:provisioning</literal> has to be either <literal>thick</literal> or <literal>thin</literal>. The driver will look for a volume type first. If the volume type is specified when creating a volume, the driver will look for the volume type definition and find the matching pool and provisioning type. If the volume type is not specified, it will fall back to use the <literal>StorageType</literal> tag in <filename> cinder_fujitsu_eternus_dx.xml</filename>."
-msgstr ""
-
 #: ./doc/config-reference/block-storage/drivers/hitachi-storage-volume-driver.xml:9(title)
 msgid "Hitachi storage volume driver"
 msgstr ""
@@ -7410,38 +6942,6 @@ msgstr ""
 msgid "Create a volume type called xio1 and set QoS min and max: <placeholder-1/>"
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:4(title)
-msgid "HP MSA Fibre Channel driver"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:5(para)
-msgid "The HP MSA fiber channel driver runs volume operations on the storage array over HTTP."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:7(para)
-msgid "A VDisk must be created on the HP MSA array first. This can be done using the web interface or the command-line interface of the array."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:9(para)
-msgid "The following options must be defined in the <systemitem>cinder-volume</systemitem> configuration file (<filename>/etc/cinder/cinder.conf</filename>):"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:14(para)
-msgid "Set the <placeholder-1/> option to <literal>cinder.volume.drivers.san.hp.hp_msa_fc.HPMSAFCDriver</literal>"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:19(para)
-msgid "Set the <placeholder-1/> option to the hostname or IP address of your HP MSA array."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:23(para)
-msgid "Set the <placeholder-1/> option to the login of an existing user of the HP MSA array."
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/hp-msa-driver.xml:28(para)
-msgid "Set the <placeholder-1/> option to the password for this user."
-msgstr ""
-
 #: ./doc/config-reference/block-storage/drivers/dell-equallogic-driver.xml:6(title)
 msgid "Dell EqualLogic volume driver"
 msgstr ""
@@ -7874,6 +7374,26 @@ msgstr ""
 msgid "Configure connectivity. For FC driver, see <xref linkend=\"configuring-connectivity-fc\"/>. For iSCSI driver, see <xref linkend=\"configuring-connectivity-iscsi\"/>."
 msgstr ""
 
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:106(title)
+msgid "Install the <package>python-pywbem</package> package"
+msgstr ""
+
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:108(para)
+msgid "Install the <package>python-pywbem</package> package for your distribution, as follows:"
+msgstr ""
+
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:112(para)
+msgid "On Ubuntu:"
+msgstr ""
+
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:116(para)
+msgid "On openSUSE:"
+msgstr ""
+
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:120(para)
+msgid "On Fedora:"
+msgstr ""
+
 #: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:126(title)
 msgid "Set up SMI-S"
 msgstr ""
@@ -7898,6 +7418,10 @@ msgstr ""
 msgid "<filename>cinder.conf</filename> configuration file"
 msgstr ""
 
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:159(para)
+msgid "Make the following changes in <filename>/etc/cinder/cinder.conf</filename>."
+msgstr ""
+
 #: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:161(para)
 msgid "Add the following entries, where <literal>10.10.61.45</literal> is the IP address of the VMAX iSCSI target:"
 msgstr ""
@@ -7926,6 +7450,14 @@ msgstr ""
 msgid "Create the <filename> /etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml </filename> file. You do not need to restart the service for this change."
 msgstr ""
 
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:207(para)
+msgid "Add the following lines to the XML file:"
+msgstr ""
+
+#: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:222(para)
+msgid "Where:"
+msgstr ""
+
 #: ./doc/config-reference/block-storage/drivers/emc-vmax-driver.xml:225(para)
 msgid "<systemitem>EcomServerIp</systemitem> and <systemitem>EcomServerPort</systemitem> are the IP address and port number of the ECOM server which is packaged with SMI-S."
 msgstr ""
@@ -8022,17 +7554,6 @@ msgstr ""
 msgid "Below is an example of how to create striped volumes. First, create a volume type. Then define the extra spec for the volume type <literal>storagetype:stripecount</literal> representing the number of meta members in the striped volume. The example below means that each volume created under the <literal>GoldStriped</literal> volume type will be striped and made up of 4 meta members."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/fusionio-volume-driver.xml:6(title)
-msgid "FusionIO volume driver for the ioControl Hybrid storage subsystem"
-msgstr ""
-
-#. <para>The volume driver configures XXX. More information about the driver is available at
-#.          <xlink href="http://example.com">example.com</xlink>.
-#.          </para>
-#: ./doc/config-reference/block-storage/drivers/fusionio-volume-driver.xml:13(para)
-msgid "Set the following in your <filename>cinder.conf</filename> to use the FusionIO volume driver:"
-msgstr ""
-
 #: ./doc/config-reference/block-storage/drivers/vmware-vmdk-driver.xml:6(title)
 msgid "VMware VMDK driver"
 msgstr ""
@@ -8533,6 +8054,10 @@ msgstr ""
 msgid "Configuration options for service labels"
 msgstr ""
 
+#: ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:243(literal)
+msgid "default"
+msgstr ""
+
 #: ./doc/config-reference/block-storage/drivers/hds-hnas-driver.xml:245(para)
 msgid "When a <literal>create_volume</literal> call with a certain volume type happens, the volume type will try to be matched up with this tag. In each configuration file you must define the <literal> default</literal> volume type in the service labels and, if no volume type is specified, the <literal>default</literal> is used. Other labels are case sensitive and should match exactly. If no configured volume types match the incoming requested type, an error occurs in the volume creation."
 msgstr ""
@@ -8733,14 +8258,6 @@ msgstr ""
 msgid "There is a volume back-end for Samba filesystems. Set the following in your <filename>cinder.conf</filename>, and use the following options to configure it."
 msgstr ""
 
-#: ./doc/config-reference/block-storage/drivers/zadara-volume-driver.xml:6(title)
-msgid "Zadara"
-msgstr ""
-
-#: ./doc/config-reference/block-storage/drivers/zadara-volume-driver.xml:7(para)
-msgid "There is a volume back-end for Zadara. Set the following in your <filename>cinder.conf</filename>, and use the following options to configure it."
-msgstr ""
-
 #: ./doc/config-reference/block-storage/backup/tsm-backup-driver.xml:6(title)
 msgid "IBM Tivoli Storage Manager backup driver"
 msgstr ""

doc/image-guide/locale/ja.po

@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-25 04:53+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-24 17:25+0000\n"
+"PO-Revision-Date: 2015-04-28 03:02+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-"
 "manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -27,6 +27,9 @@ msgstr ""
 "この例は、<placeholder-1/> と KVM ハイパーバイザーを用いて、Windows Server "
 "2012 qcow2 イメージを作成します。"
 
+msgid "Follow these steps to prepare the installation:"
+msgstr "以下の手順に沿って、インストールを準備します。"
+
 msgid ""
 "Download a Windows Server 2012 installation ISO. Evaluation images are "
 "available on <link href=\"http://www.microsoft.com/en-us/evalcenter/evaluate-"
@@ -136,9 +139,18 @@ msgstr ""
 msgid "Wait for the machine shutdown."
 msgstr "マシンがシャットダウンされるのを待ちます。"
 
+msgid "Your image is ready to upload to the Image service:"
+msgstr "お使いのイメージを Image にアップロードする準備ができました。"
+
 msgid "Disk and container formats for images"
 msgstr "イメージのディスク形式とコンテナー形式"
 
+msgid ""
+"When you add an image to the Image service, you can specify its disk and "
+"container formats."
+msgstr ""
+"イメージを Image に追加するとき、そのディスクとコンテナー形式を指定できます。"
+
 msgid "Disk formats"
 msgstr "ディスク形式"
 

doc/install-guide/locale/install-guide.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-04-27 06:08+0000\n"
+"POT-Creation-Date: 2015-04-28 06:08+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"
@@ -1198,7 +1198,7 @@ msgstr ""
 msgid "To create the network"
 msgstr ""
 
-#: ./doc/install-guide/section_nova-networking-initial-network.xml:28(para)
+#: ./doc/install-guide/section_nova-networking-initial-network.xml:28(para) ./doc/install-guide/section_heat-verify.xml:12(para)
 msgid "Source the <literal>admin</literal> tenant credentials:"
 msgstr ""
 
@@ -1670,10 +1670,6 @@ msgstr ""
 msgid "This section describes how to verify operation of the Orchestration module (heat)."
 msgstr ""
 
-#: ./doc/install-guide/section_heat-verify.xml:12(para) ./doc/install-guide/section_launch-instance-nova.xml:16(para) ./doc/install-guide/section_sahara-verify.xml:13(para) ./doc/install-guide/section_launch-instance-neutron.xml:15(para)
-msgid "Source the <literal>demo</literal> tenant credentials:"
-msgstr ""
-
 #: ./doc/install-guide/section_heat-verify.xml:16(para)
 msgid "The Orchestration module uses templates to describe stacks. To learn about the template language, see <link href=\"http://docs.openstack.org/developer/heat/template_guide/index.html\">the Template Guide</link> in the <link href=\"http://docs.openstack.org/developer/heat/\">Heat developer documentation</link>."
 msgstr ""
@@ -2241,6 +2237,10 @@ msgstr ""
 msgid "Most cloud images support <glossterm>public key authentication</glossterm> rather than conventional user name/password authentication. Before launching an instance, you must generate a public/private key pair using <placeholder-1/> and add the public key to your OpenStack environment."
 msgstr ""
 
+#: ./doc/install-guide/section_launch-instance-nova.xml:16(para) ./doc/install-guide/section_sahara-verify.xml:13(para) ./doc/install-guide/section_launch-instance-neutron.xml:15(para)
+msgid "Source the <literal>demo</literal> tenant credentials:"
+msgstr ""
+
 #: ./doc/install-guide/section_launch-instance-nova.xml:20(para)
 msgid "Generate a key pair:"
 msgstr ""
@@ -4206,7 +4206,7 @@ msgid "ceilometer"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:36(td)
-msgid "OpenStack Ceilometer Daemons"
+msgid "OpenStack ceilometer daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:37(td)
@@ -4222,7 +4222,7 @@ msgid "cinder"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:42(td)
-msgid "OpenStack Cinder Daemons"
+msgid "OpenStack cinder daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:43(td)
@@ -4234,7 +4234,7 @@ msgid "glance"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:48(td)
-msgid "OpenStack Glance Daemons"
+msgid "OpenStack glance daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:49(td)
@@ -4246,7 +4246,7 @@ msgid "heat"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:54(td)
-msgid "OpenStack Heat Daemons"
+msgid "OpenStack heat daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:55(td)
@@ -4258,7 +4258,7 @@ msgid "keystone"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:60(td)
-msgid "OpenStack Keystone Daemons"
+msgid "OpenStack keystone daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:61(td)
@@ -4270,7 +4270,7 @@ msgid "neutron"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:66(td)
-msgid "OpenStack Neutron Daemons"
+msgid "OpenStack neutron daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:67(td)
@@ -4282,7 +4282,7 @@ msgid "nova"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:72(td)
-msgid "OpenStack Nova Daemons"
+msgid "OpenStack nova daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:73(td)
@@ -4298,7 +4298,7 @@ msgid "swift"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:79(td)
-msgid "OpenStack Swift Daemons"
+msgid "OpenStack swift daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:80(td)
@@ -4310,7 +4310,7 @@ msgid "trove"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:85(td)
-msgid "OpenStack Trove Daemons"
+msgid "OpenStack trove daemons"
 msgstr ""
 
 #: ./doc/install-guide/app_reserved_uids.xml:90(para)
@@ -5019,7 +5019,7 @@ msgid "The Identity service manages a catalog of API endpoints associated with t
 msgstr ""
 
 #: ./doc/install-guide/section_keystone-services.xml:79(para)
-msgid "OpenStack uses three API endpoint variants for each service: admin, internal, and public. The admin API endpoint allows modifying users and tenants by default, while the public and internal APIs do not. In a production environment, the variants might reside on separate networks that service different types of users for security reasons. For instance, the public API network might be reachable from outside the cloud for management tools, the admin API network might be protected, while the internal API network is connected to each host. Also, OpenStack supports multiple regions for scalability. For simplicity, this guide uses the management network for all endpoint variations and the default <literal>regionOne</literal> region."
+msgid "OpenStack uses three API endpoint variants for each service: admin, internal, and public. The admin API endpoint allows modifying users and tenants by default, while the public and internal APIs do not. In a production environment, the variants might reside on separate networks that service different types of users for security reasons. For instance, the public API network might be reachable from outside the cloud for management tools, the admin API network might be protected, while the internal API network is connected to each host. Also, OpenStack supports multiple regions for scalability. For simplicity, this guide uses the management network for all endpoint variations and the default <literal>RegionOne</literal> region."
 msgstr ""
 
 #: ./doc/install-guide/section_keystone-services.xml:91(para)

doc/install-guide/locale/ja.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-27 01:31+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-27 01:34+0000\n"
+"PO-Revision-Date: 2015-04-27 17:35+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-"
 "manuals-i18n/language/ja/)\n"
@@ -2239,9 +2239,6 @@ msgstr ""
 "このセクションは、Orchestration モジュール (heat) の動作を検証する方法につい"
 "て説明します。"
 
-msgid "Source the <literal>demo</literal> tenant credentials:"
-msgstr "<literal>demo</literal> プロジェクトのクレデンシャルを読み込みます。"
-
 msgid ""
 "The Orchestration module uses templates to describe stacks. To learn about "
 "the template language, see <link href=\"http://docs.openstack.org/developer/"
@@ -2943,6 +2940,9 @@ msgstr "レガシーネットワーク (nova-network) を用いたインスタ
 msgid "To generate a key pair"
 msgstr "キーペアの生成方法"
 
+msgid "Source the <literal>demo</literal> tenant credentials:"
+msgstr "<literal>demo</literal> プロジェクトのクレデンシャルを読み込みます。"
+
 msgid "Generate a key pair:"
 msgstr "キーペアを生成します。"
 
@@ -5293,9 +5293,6 @@ msgstr "ID"
 msgid "ceilometer"
 msgstr "ceilometer"
 
-msgid "OpenStack Ceilometer Daemons"
-msgstr "OpenStack Ceilometer デーモン"
-
 msgid "166"
 msgstr "166"
 
@@ -5305,54 +5302,36 @@ msgstr "パッケージインストール中の割り当て"
 msgid "cinder"
 msgstr "cinder"
 
-msgid "OpenStack Cinder Daemons"
-msgstr "OpenStack Cinder デーモン"
-
 msgid "165"
 msgstr "165"
 
 msgid "glance"
 msgstr "glance"
 
-msgid "OpenStack Glance Daemons"
-msgstr "OpenStack Glance デーモン"
-
 msgid "161"
 msgstr "161"
 
 msgid "heat"
 msgstr "heat"
 
-msgid "OpenStack Heat Daemons"
-msgstr "OpenStack Heat デーモン"
-
 msgid "187"
 msgstr "187"
 
 msgid "keystone"
 msgstr "keystone"
 
-msgid "OpenStack Keystone Daemons"
-msgstr "OpenStack Keystone デーモン"
-
 msgid "163"
 msgstr "163"
 
 msgid "neutron"
 msgstr "neutron"
 
-msgid "OpenStack Neutron Daemons"
-msgstr "OpenStack Neutron デーモン"
-
 msgid "164"
 msgstr "164"
 
 msgid "nova"
 msgstr "nova"
 
-msgid "OpenStack Nova Daemons"
-msgstr "OpenStack Nova デーモン"
-
 msgid "162"
 msgstr "162"
 
@@ -5362,18 +5341,12 @@ msgstr "96"
 msgid "swift"
 msgstr "swift"
 
-msgid "OpenStack Swift Daemons"
-msgstr "OpenStack Swift デーモン"
-
 msgid "160"
 msgstr "160"
 
 msgid "trove"
 msgstr "trove"
 
-msgid "OpenStack Trove Daemons"
-msgstr "OpenStack Trove デーモン"
-
 msgid "Each user belongs to a user group with the same name as the user."
 msgstr "各ユーザーはユーザーと同じ名前のユーザーグループに所属します。"
 

doc/install-guide/locale/ko_KR.po

@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-27 01:31+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-27 01:34+0000\n"
+"PO-Revision-Date: 2015-04-27 17:35+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/openstack-"
 "manuals-i18n/language/ko_KR/)\n"
@@ -3221,9 +3221,6 @@ msgstr "ID"
 msgid "ceilometer"
 msgstr "ceilometer"
 
-msgid "OpenStack Ceilometer Daemons"
-msgstr "OpenStack Ceilometer Daemons"
-
 msgid "166"
 msgstr "166"
 
@@ -3233,54 +3230,36 @@ msgstr "패키지 설치하는 동안 지정"
 msgid "cinder"
 msgstr "cinder"
 
-msgid "OpenStack Cinder Daemons"
-msgstr "OpenStack Cinder Daemons"
-
 msgid "165"
 msgstr "165"
 
 msgid "glance"
 msgstr "glance"
 
-msgid "OpenStack Glance Daemons"
-msgstr "OpenStack Glance Daemons"
-
 msgid "161"
 msgstr "161"
 
 msgid "heat"
 msgstr "heat"
 
-msgid "OpenStack Heat Daemons"
-msgstr "OpenStack Glance Daemons"
-
 msgid "187"
 msgstr "187"
 
 msgid "keystone"
 msgstr "keystone"
 
-msgid "OpenStack Keystone Daemons"
-msgstr "OpenStack Keystone Daemons"
-
 msgid "163"
 msgstr "163"
 
 msgid "neutron"
 msgstr "neutron"
 
-msgid "OpenStack Neutron Daemons"
-msgstr "OpenStack Neutron Daemons"
-
 msgid "164"
 msgstr "164"
 
 msgid "nova"
 msgstr "nova"
 
-msgid "OpenStack Nova Daemons"
-msgstr "OpenStack Nova Daemons"
-
 msgid "162"
 msgstr "162"
 
@@ -3290,18 +3269,12 @@ msgstr "96"
 msgid "swift"
 msgstr "swift"
 
-msgid "OpenStack Swift Daemons"
-msgstr "OpenStack Swift Daemons"
-
 msgid "160"
 msgstr "160"
 
 msgid "trove"
 msgstr "trove"
 
-msgid "OpenStack Trove Daemons"
-msgstr "OpenStack Trove 데몬"
-
 msgid "Each user belongs to a user group with the same name as the user."
 msgstr "각 사용자는 같은 이름의 유저 그룹에 사용자로 속합니다."
 

doc/install-guide/locale/pt_BR.po

@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-27 01:31+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-27 01:34+0000\n"
+"PO-Revision-Date: 2015-04-27 17:35+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "openstack-manuals-i18n/language/pt_BR/)\n"
@@ -2026,9 +2026,6 @@ msgstr ""
 "Esta seção descreve como verificar a operação do módulo de Orquestração "
 "(heat)."
 
-msgid "Source the <literal>demo</literal> tenant credentials:"
-msgstr "Obtenha as credenciais do tenant <literal>demo</literal> :"
-
 msgid ""
 "The Orchestration module uses templates to describe stacks. To learn about "
 "the template language, see <link href=\"http://docs.openstack.org/developer/"
@@ -2788,6 +2785,9 @@ msgstr ""
 "utilizando <placeholder-1/> e adicionar a chave pública no seu ambiente "
 "OpenStack."
 
+msgid "Source the <literal>demo</literal> tenant credentials:"
+msgstr "Obtenha as credenciais do tenant <literal>demo</literal> :"
+
 msgid "Generate a key pair:"
 msgstr "Gere um par de chaves:"
 
@@ -5442,9 +5442,6 @@ msgstr "ID"
 msgid "ceilometer"
 msgstr "ceilometer"
 
-msgid "OpenStack Ceilometer Daemons"
-msgstr "Daemons de Ceilometer do openStack"
-
 msgid "166"
 msgstr "166"
 
@@ -5454,54 +5451,36 @@ msgstr "Atribuído durante a instalação de pacotes."
 msgid "cinder"
 msgstr "cinder"
 
-msgid "OpenStack Cinder Daemons"
-msgstr "Daemons de Cinder do OpenStack"
-
 msgid "165"
 msgstr "165"
 
 msgid "glance"
 msgstr "glance"
 
-msgid "OpenStack Glance Daemons"
-msgstr "Daemons de Glance do OpenStack"
-
 msgid "161"
 msgstr "161"
 
 msgid "heat"
 msgstr "heat"
 
-msgid "OpenStack Heat Daemons"
-msgstr "Daemons de Heat do OpenStack"
-
 msgid "187"
 msgstr "187"
 
 msgid "keystone"
 msgstr "keystone"
 
-msgid "OpenStack Keystone Daemons"
-msgstr "Daemons de Keystone do OpenStack"
-
 msgid "163"
 msgstr "163"
 
 msgid "neutron"
 msgstr "neutron"
 
-msgid "OpenStack Neutron Daemons"
-msgstr "Daemons de Neutron do OpenStack"
-
 msgid "164"
 msgstr "164"
 
 msgid "nova"
 msgstr "nova"
 
-msgid "OpenStack Nova Daemons"
-msgstr "Daemons de Nova do OpenStack"
-
 msgid "162"
 msgstr "162"
 
@@ -5511,18 +5490,12 @@ msgstr "96"
 msgid "swift"
 msgstr "swift"
 
-msgid "OpenStack Swift Daemons"
-msgstr "Daemons de Swift do OpenStack"
-
 msgid "160"
 msgstr "160"
 
 msgid "trove"
 msgstr "trove"
 
-msgid "OpenStack Trove Daemons"
-msgstr "OpenStack Trove Daemons"
-
 msgid "Each user belongs to a user group with the same name as the user."
 msgstr ""
 "Cada usuário pertence a um grupo de usuários com o mesmo nome do usuário."

doc/install-guide/locale/ru.po

@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-25 04:53+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-25 03:36+0000\n"
+"PO-Revision-Date: 2015-04-27 17:35+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/openstack-"
 "manuals-i18n/language/ru/)\n"
@@ -1651,9 +1651,6 @@ msgstr "Подготовьте ответы на запросы debconf"
 msgid "MYSQL_PASSWORD"
 msgstr "MYSQL_PASSWORD"
 
-msgid "Source the <literal>demo</literal> tenant credentials:"
-msgstr "Загрузите учётные данные арендатора <literal>demo</literal>:"
-
 msgid ""
 "Edit the <filename>/etc/swift/swift.conf</filename> file and complete the "
 "following actions:"
@@ -2284,6 +2281,9 @@ msgstr ""
 "закрытого ключей используя <placeholder-1/> и добавить открытый ключ в вашу "
 "среду OpenStack."
 
+msgid "Source the <literal>demo</literal> tenant credentials:"
+msgstr "Загрузите учётные данные арендатора <literal>demo</literal>:"
+
 msgid "Generate a key pair:"
 msgstr "Сгенерируйте пару ключей:"
 
@@ -4222,63 +4222,42 @@ msgstr "ID"
 msgid "ceilometer"
 msgstr "ceilometer"
 
-msgid "OpenStack Ceilometer Daemons"
-msgstr "Демоны OpenStack Ceilometer"
-
 msgid "166"
 msgstr "166"
 
 msgid "cinder"
 msgstr "cinder"
 
-msgid "OpenStack Cinder Daemons"
-msgstr "Демоны OpenStack Cinder"
-
 msgid "165"
 msgstr "165"
 
 msgid "glance"
 msgstr "glance"
 
-msgid "OpenStack Glance Daemons"
-msgstr "Демоны OpenStack Glance"
-
 msgid "161"
 msgstr "161"
 
 msgid "heat"
 msgstr "heat"
 
-msgid "OpenStack Heat Daemons"
-msgstr "Демоны OpenStack Heat"
-
 msgid "187"
 msgstr "187"
 
 msgid "keystone"
 msgstr "keystone"
 
-msgid "OpenStack Keystone Daemons"
-msgstr "Демоны Openstack Keystone"
-
 msgid "163"
 msgstr "163"
 
 msgid "neutron"
 msgstr "neutron"
 
-msgid "OpenStack Neutron Daemons"
-msgstr "Демоны OpenStack Daemons"
-
 msgid "164"
 msgstr "164"
 
 msgid "nova"
 msgstr "nova"
 
-msgid "OpenStack Nova Daemons"
-msgstr "Демоны OpenStack Nova"
-
 msgid "162"
 msgstr "162"
 
@@ -4288,9 +4267,6 @@ msgstr "96"
 msgid "swift"
 msgstr "swift"
 
-msgid "OpenStack Swift Daemons"
-msgstr "Демоны OpenStack Swift"
-
 msgid "160"
 msgstr "160"
 

doc/install-guide/locale/zh_CN.po

@@ -22,8 +22,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-04-27 01:31+0000\n"
+"POT-Creation-Date: 2015-04-28 02:16+0000\n"
-"PO-Revision-Date: 2015-04-27 01:34+0000\n"
+"PO-Revision-Date: 2015-04-27 17:35+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "openstack-manuals-i18n/language/zh_CN/)\n"
@@ -2054,9 +2054,6 @@ msgid ""
 "(heat)."
 msgstr "这个不分将描述如何验证 Orchestration 模块 (heat) 的操作。"
 
-msgid "Source the <literal>demo</literal> tenant credentials:"
-msgstr "Source <literal>demo</literal> 租户凭证："
-
 msgid ""
 "The Orchestration module uses templates to describe stacks. To learn about "
 "the template language, see <link href=\"http://docs.openstack.org/developer/"
@@ -2782,6 +2779,9 @@ msgstr ""
 "证的方式。在启动实例之前，您必须生成一个公钥/私钥对使用<placeholder-1/>并将公"
 "钥添加到您的 OpenStack 环境中。"
 
+msgid "Source the <literal>demo</literal> tenant credentials:"
+msgstr "Source <literal>demo</literal> 租户凭证："
+
 msgid "Generate a key pair:"
 msgstr "生成密钥对："
 
@@ -5283,9 +5283,6 @@ msgstr "ID"
 msgid "ceilometer"
 msgstr "ceilometer"
 
-msgid "OpenStack Ceilometer Daemons"
-msgstr "OpenStack Ceilometer 守护进程"
-
 msgid "166"
 msgstr "166"
 
@@ -5295,54 +5292,36 @@ msgstr "在包安装过程中分配"
 msgid "cinder"
 msgstr "cinder"
 
-msgid "OpenStack Cinder Daemons"
-msgstr "OpenStack Cinder 守护进程"
-
 msgid "165"
 msgstr "165"
 
 msgid "glance"
 msgstr "glance"
 
-msgid "OpenStack Glance Daemons"
-msgstr "OpenStack Glance 守护进程"
-
 msgid "161"
 msgstr "161"
 
 msgid "heat"
 msgstr "heat"
 
-msgid "OpenStack Heat Daemons"
-msgstr "OpenStack Heat 守护进程"
-
 msgid "187"
 msgstr "187"
 
 msgid "keystone"
 msgstr "keystone"
 
-msgid "OpenStack Keystone Daemons"
-msgstr "OpenStack Keystone 守护进程"
-
 msgid "163"
 msgstr "163"
 
 msgid "neutron"
 msgstr "neutron"
 
-msgid "OpenStack Neutron Daemons"
-msgstr "OpenStack Neutron 守护进程"
-
 msgid "164"
 msgstr "164"
 
 msgid "nova"
 msgstr "nova"
 
-msgid "OpenStack Nova Daemons"
-msgstr "OpenStack Nova 守护进程"
-
 msgid "162"
 msgstr "162"
 
@@ -5352,18 +5331,12 @@ msgstr "96"
 msgid "swift"
 msgstr "swift"
 
-msgid "OpenStack Swift Daemons"
-msgstr "OpenStack Swift 守护进程"
-
 msgid "160"
 msgstr "160"
 
 msgid "trove"
 msgstr "trove"
 
-msgid "OpenStack Trove Daemons"
-msgstr "OpenStack Trove 守护进程"
-
 msgid "Each user belongs to a user group with the same name as the user."
 msgstr "每个用户都属于一个和用户同名的用户组。"