Imported Translations from Transifex

Change-Id: I024fe232b301388c146d4a5ada2991f923b5d7fd
2014-07-27 06:10:04 +00:00 · 2014-07-27 06:10:04 +00:00 · 44b3b2b340
commit 44b3b2b340
parent 5fb341153e
12 changed files with 5979 additions and 5889 deletions
--- a/doc/arch-design/locale/arch-design.pot
+++ b/doc/arch-design/locale/arch-design.pot
--- a/doc/cli-reference/locale/cli-reference.pot
+++ b/doc/cli-reference/locale/cli-reference.pot
@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-23 06:12+0000\n"
+"POT-Creation-Date: 2014-07-27 06:09+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"
@ -7527,7 +7527,7 @@ msgid "Identity service command-line client"
 msgstr ""

 #: ./doc/cli-reference/generated/ch_cli_keystone_commands.xml:13(para)
-msgid "The <placeholder-1/> client is the command-line interface (CLI) for the OpenStack Identity API and its extensions. This chapter documents <placeholder-2/> version 0.10.0."
+msgid "The <placeholder-1/> client is the command-line interface (CLI) for the OpenStack Identity API and its extensions. This chapter documents <placeholder-2/> version 0.10.1."
 msgstr ""

 #: ./doc/cli-reference/generated/ch_cli_keystone_commands.xml:23(title)
--- a/doc/common/locale/common.pot
+++ b/doc/common/locale/common.pot
--- a/doc/common/locale/fr.po
+++ b/doc/common/locale/fr.po
@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-07-24 02:16+0000\n"
-"PO-Revision-Date: 2014-07-24 02:16+0000\n"
+"POT-Creation-Date: 2014-07-27 05:14+0000\n"
+"PO-Revision-Date: 2014-07-26 18:41+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/fr/)\n"
 "MIME-Version: 1.0\n"
@ -593,6 +593,7 @@ msgstr ""
 #: ./doc/common/tables/neutron-quotas.xml13(th)
 #: ./doc/common/tables/nova-auth_token.xml13(th)
 #: ./doc/common/tables/cinder-storage_nfs.xml13(th)
+#: ./doc/common/tables/cinder-hds-hnas.xml13(th)
 #: ./doc/common/tables/heat-api.xml13(th)
 #: ./doc/common/tables/swift-proxy-server-filter-tempurl.xml15(th)
 #: ./doc/common/tables/heat-clients_ceilometer.xml13(th)
@ -10994,6 +10995,7 @@ msgstr "Sections"
 #: ./doc/common/tables/heat-auth_token.xml18(th)
 #: ./doc/common/tables/neutron-quotas.xml18(th)
 #: ./doc/common/tables/cinder-storage_nfs.xml18(th)
+#: ./doc/common/tables/cinder-hds-hnas.xml18(th)
 #: ./doc/common/tables/heat-api.xml18(th)
 #: ./doc/common/tables/glance-logging.xml18(th)
 #: ./doc/common/tables/neutron-metering_agent.xml18(th)
@ -11123,7 +11125,7 @@ msgstr "Presque toutes les options de configuration sont organisées dans cette

 #: ./doc/common/section_config_format.xml146(literal)
 #: ./doc/common/tables/ceilometer-database.xml25(th)
-#: ./doc/common/tables/cinder-database.xml33(th)
+#: ./doc/common/tables/cinder-database.xml29(th)
 #: ./doc/common/tables/glance-database.xml18(th)
 #: ./doc/common/tables/neutron-database.xml18(th)
 #: ./doc/common/tables/nova-database.xml25(th)
@ -13954,6 +13956,7 @@ msgstr ""
 #: ./doc/common/tables/neutron-quotas.xml12(th)
 #: ./doc/common/tables/nova-auth_token.xml12(th)
 #: ./doc/common/tables/cinder-storage_nfs.xml12(th)
+#: ./doc/common/tables/cinder-hds-hnas.xml12(th)
 #: ./doc/common/tables/heat-api.xml12(th)
 #: ./doc/common/tables/swift-proxy-server-filter-tempurl.xml14(th)
 #: ./doc/common/tables/heat-clients_ceilometer.xml12(th)
@ -14188,7 +14191,7 @@ msgid "(StrOpt) DEPRECATED - Database connection string."
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml28(td)
-#: ./doc/common/tables/cinder-database.xml36(td)
+#: ./doc/common/tables/cinder-database.xml32(td)
 #: ./doc/common/tables/glance-database.xml21(td)
 #: ./doc/common/tables/neutron-database.xml21(td)
 #: ./doc/common/tables/nova-database.xml28(td)
@ -14199,7 +14202,6 @@ msgstr "backend = sqlalchemy"

 #: ./doc/common/tables/ceilometer-database.xml29(td)
 #: ./doc/common/tables/cinder-database.xml22(td)
-#: ./doc/common/tables/cinder-database.xml37(td)
 #: ./doc/common/tables/glance-database.xml22(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml105(td)
 #: ./doc/common/tables/neutron-database.xml22(td)
@ -14209,6 +14211,7 @@ msgid "(StrOpt) The backend to use for db"
 msgstr "StrOpt)  Le backend à utiliser pour la base de données"

 #: ./doc/common/tables/ceilometer-database.xml32(td)
+#: ./doc/common/tables/cinder-database.xml36(td)
 #: ./doc/common/tables/glance-database.xml25(td)
 #: ./doc/common/tables/nova-database.xml32(td)
 #: ./doc/common/tables/heat-database.xml25(td)
@ -14217,7 +14220,6 @@ msgid "connection = None"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml33(td)
-#: ./doc/common/tables/cinder-database.xml41(td)
 #: ./doc/common/tables/glance-database.xml26(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml109(td)
 #: ./doc/common/tables/neutron-database.xml26(td)
@ -14228,7 +14230,7 @@ msgid ""
 msgstr "(StrOpt)  La chaîne de connexion SQLAlchemy utilisée pour se connecter à la base de données bare-metal"

 #: ./doc/common/tables/ceilometer-database.xml36(td)
-#: ./doc/common/tables/cinder-database.xml44(td)
+#: ./doc/common/tables/cinder-database.xml40(td)
 #: ./doc/common/tables/glance-database.xml29(td)
 #: ./doc/common/tables/neutron-database.xml29(td)
 #: ./doc/common/tables/nova-database.xml36(td)
@ -14238,7 +14240,6 @@ msgid "connection_debug = 0"
 msgstr "connection_debug = 0"

 #: ./doc/common/tables/ceilometer-database.xml37(td)
-#: ./doc/common/tables/cinder-database.xml45(td)
 #: ./doc/common/tables/glance-database.xml30(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml113(td)
 #: ./doc/common/tables/neutron-database.xml30(td)
@ -14249,7 +14250,7 @@ msgid ""
 msgstr "(IntOpt) Verbosité de l’information de débogage SQL.0=Aucune, 100=Tout"

 #: ./doc/common/tables/ceilometer-database.xml40(td)
-#: ./doc/common/tables/cinder-database.xml48(td)
+#: ./doc/common/tables/cinder-database.xml44(td)
 #: ./doc/common/tables/glance-database.xml33(td)
 #: ./doc/common/tables/neutron-database.xml33(td)
 #: ./doc/common/tables/nova-database.xml40(td)
@ -14259,7 +14260,6 @@ msgid "connection_trace = False"
 msgstr "connection_trace = False"

 #: ./doc/common/tables/ceilometer-database.xml41(td)
-#: ./doc/common/tables/cinder-database.xml49(td)
 #: ./doc/common/tables/glance-database.xml34(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml117(td)
 #: ./doc/common/tables/neutron-database.xml34(td)
@ -14269,7 +14269,7 @@ msgid "(BoolOpt) Add python stack traces to SQL as comment strings"
 msgstr "(BoolOpt) Ajouter des traces de pile Python à SQL en tant que chaînes de commentaires"

 #: ./doc/common/tables/ceilometer-database.xml44(td)
-#: ./doc/common/tables/cinder-database.xml52(td)
+#: ./doc/common/tables/cinder-database.xml48(td)
 #: ./doc/common/tables/glance-database.xml37(td)
 #: ./doc/common/tables/neutron-database.xml37(td)
 #: ./doc/common/tables/nova-database.xml44(td)
@ -14279,7 +14279,6 @@ msgid "db_inc_retry_interval = True"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml45(td)
-#: ./doc/common/tables/cinder-database.xml53(td)
 #: ./doc/common/tables/glance-database.xml38(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml121(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml105(td)
@ -14294,7 +14293,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml48(td)
-#: ./doc/common/tables/cinder-database.xml56(td)
+#: ./doc/common/tables/cinder-database.xml52(td)
 #: ./doc/common/tables/glance-database.xml41(td)
 #: ./doc/common/tables/neutron-database.xml41(td)
 #: ./doc/common/tables/nova-database.xml48(td)
@ -14304,7 +14303,6 @@ msgid "db_max_retries = 20"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml49(td)
-#: ./doc/common/tables/cinder-database.xml57(td)
 #: ./doc/common/tables/glance-database.xml42(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml125(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml109(td)
@ -14319,7 +14317,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml52(td)
-#: ./doc/common/tables/cinder-database.xml60(td)
+#: ./doc/common/tables/cinder-database.xml56(td)
 #: ./doc/common/tables/glance-database.xml45(td)
 #: ./doc/common/tables/neutron-database.xml45(td)
 #: ./doc/common/tables/nova-database.xml52(td)
@ -14329,7 +14327,6 @@ msgid "db_max_retry_interval = 10"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml53(td)
-#: ./doc/common/tables/cinder-database.xml61(td)
 #: ./doc/common/tables/glance-database.xml46(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml129(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml113(td)
@ -14344,7 +14341,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml56(td)
-#: ./doc/common/tables/cinder-database.xml64(td)
+#: ./doc/common/tables/cinder-database.xml60(td)
 #: ./doc/common/tables/glance-database.xml49(td)
 #: ./doc/common/tables/neutron-database.xml49(td)
 #: ./doc/common/tables/nova-database.xml56(td)
@ -14354,7 +14351,6 @@ msgid "db_retry_interval = 1"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml57(td)
-#: ./doc/common/tables/cinder-database.xml65(td)
 #: ./doc/common/tables/glance-database.xml50(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml133(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml117(td)
@ -14367,7 +14363,7 @@ msgid "(IntOpt) seconds between db connection retries"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml60(td)
-#: ./doc/common/tables/cinder-database.xml68(td)
+#: ./doc/common/tables/cinder-database.xml64(td)
 #: ./doc/common/tables/glance-database.xml53(td)
 #: ./doc/common/tables/neutron-database.xml53(td)
 #: ./doc/common/tables/nova-database.xml60(td)
@ -14377,7 +14373,6 @@ msgid "idle_timeout = 3600"
 msgstr "idle_timeout = 3600"

 #: ./doc/common/tables/ceilometer-database.xml61(td)
-#: ./doc/common/tables/cinder-database.xml69(td)
 #: ./doc/common/tables/glance-database.xml54(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml137(td)
 #: ./doc/common/tables/neutron-database.xml54(td)
@ -14387,7 +14382,7 @@ msgid "(IntOpt) Timeout before idle sql connections are reaped"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml64(td)
-#: ./doc/common/tables/cinder-database.xml72(td)
+#: ./doc/common/tables/cinder-database.xml68(td)
 #: ./doc/common/tables/glance-database.xml57(td)
 #: ./doc/common/tables/nova-database.xml64(td)
 #: ./doc/common/tables/heat-database.xml57(td)
@ -14396,7 +14391,6 @@ msgid "max_overflow = None"
 msgstr "max_overflow = None"

 #: ./doc/common/tables/ceilometer-database.xml65(td)
-#: ./doc/common/tables/cinder-database.xml73(td)
 #: ./doc/common/tables/glance-database.xml58(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml141(td)
 #: ./doc/common/tables/neutron-database.xml58(td)
@ -14406,7 +14400,7 @@ msgid "(IntOpt) If set, use this value for max_overflow with sqlalchemy"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml68(td)
-#: ./doc/common/tables/cinder-database.xml76(td)
+#: ./doc/common/tables/cinder-database.xml72(td)
 #: ./doc/common/tables/glance-database.xml61(td)
 #: ./doc/common/tables/nova-database.xml68(td)
 #: ./doc/common/tables/heat-database.xml61(td)
@ -14415,7 +14409,6 @@ msgid "max_pool_size = None"
 msgstr "max_pool_size = None"

 #: ./doc/common/tables/ceilometer-database.xml69(td)
-#: ./doc/common/tables/cinder-database.xml77(td)
 #: ./doc/common/tables/glance-database.xml62(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml145(td)
 #: ./doc/common/tables/neutron-database.xml62(td)
@ -14425,7 +14418,7 @@ msgid "(IntOpt) Maximum number of SQL connections to keep open in a pool"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml72(td)
-#: ./doc/common/tables/cinder-database.xml80(td)
+#: ./doc/common/tables/cinder-database.xml76(td)
 #: ./doc/common/tables/glance-database.xml65(td)
 #: ./doc/common/tables/neutron-database.xml65(td)
 #: ./doc/common/tables/nova-database.xml72(td)
@ -14435,7 +14428,6 @@ msgid "max_retries = 10"
 msgstr "max_retries = 10"

 #: ./doc/common/tables/ceilometer-database.xml73(td)
-#: ./doc/common/tables/cinder-database.xml81(td)
 #: ./doc/common/tables/glance-database.xml66(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml149(td)
 #: ./doc/common/tables/neutron-database.xml66(td)
@ -14447,7 +14439,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml76(td)
-#: ./doc/common/tables/cinder-database.xml84(td)
+#: ./doc/common/tables/cinder-database.xml80(td)
 #: ./doc/common/tables/glance-database.xml69(td)
 #: ./doc/common/tables/neutron-database.xml69(td)
 #: ./doc/common/tables/nova-database.xml76(td)
@ -14457,7 +14449,6 @@ msgid "min_pool_size = 1"
 msgstr "min_pool_size = 1"

 #: ./doc/common/tables/ceilometer-database.xml77(td)
-#: ./doc/common/tables/cinder-database.xml85(td)
 #: ./doc/common/tables/glance-database.xml70(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml153(td)
 #: ./doc/common/tables/neutron-database.xml70(td)
@ -14467,7 +14458,7 @@ msgid "(IntOpt) Minimum number of SQL connections to keep open in a pool"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml80(td)
-#: ./doc/common/tables/cinder-database.xml88(td)
+#: ./doc/common/tables/cinder-database.xml84(td)
 #: ./doc/common/tables/glance-database.xml73(td)
 #: ./doc/common/tables/neutron-database.xml73(td)
 #: ./doc/common/tables/nova-database.xml80(td)
@ -14477,7 +14468,7 @@ msgid "mysql_sql_mode = TRADITIONAL"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml81(td)
-#: ./doc/common/tables/cinder-database.xml89(td)
+#: ./doc/common/tables/cinder-database.xml85(td)
 #: ./doc/common/tables/glance-database.xml74(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml157(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml121(td)
@ -14493,7 +14484,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml84(td)
-#: ./doc/common/tables/cinder-database.xml92(td)
+#: ./doc/common/tables/cinder-database.xml88(td)
 #: ./doc/common/tables/glance-database.xml77(td)
 #: ./doc/common/tables/nova-database.xml84(td)
 #: ./doc/common/tables/heat-database.xml77(td)
@ -14502,7 +14493,6 @@ msgid "pool_timeout = None"
 msgstr "pool_timeout = None"

 #: ./doc/common/tables/ceilometer-database.xml85(td)
-#: ./doc/common/tables/cinder-database.xml93(td)
 #: ./doc/common/tables/glance-database.xml78(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml161(td)
 #: ./doc/common/tables/neutron-database.xml78(td)
@ -14512,7 +14502,7 @@ msgid "(IntOpt) If set, use this value for pool_timeout with sqlalchemy"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml88(td)
-#: ./doc/common/tables/cinder-database.xml96(td)
+#: ./doc/common/tables/cinder-database.xml92(td)
 #: ./doc/common/tables/glance-database.xml81(td)
 #: ./doc/common/tables/neutron-database.xml81(td)
 #: ./doc/common/tables/nova-database.xml88(td)
@ -14522,7 +14512,6 @@ msgid "retry_interval = 10"
 msgstr "retry_interval = 10"

 #: ./doc/common/tables/ceilometer-database.xml89(td)
-#: ./doc/common/tables/cinder-database.xml97(td)
 #: ./doc/common/tables/glance-database.xml82(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml165(td)
 #: ./doc/common/tables/neutron-database.xml82(td)
@ -14536,7 +14525,6 @@ msgid "sqlite_db = ceilometer.sqlite"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml93(td)
-#: ./doc/common/tables/cinder-database.xml101(td)
 #: ./doc/common/tables/glance-database.xml86(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml169(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml125(td)
@ -14548,7 +14536,7 @@ msgid "(StrOpt) The file name to use with SQLite"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml96(td)
-#: ./doc/common/tables/cinder-database.xml104(td)
+#: ./doc/common/tables/cinder-database.xml100(td)
 #: ./doc/common/tables/glance-database.xml89(td)
 #: ./doc/common/tables/neutron-database.xml89(td)
 #: ./doc/common/tables/nova-database.xml100(td)
@ -14558,7 +14546,6 @@ msgid "sqlite_synchronous = True"
 msgstr "sqlite_synchronous = True"

 #: ./doc/common/tables/ceilometer-database.xml97(td)
-#: ./doc/common/tables/cinder-database.xml105(td)
 #: ./doc/common/tables/glance-database.xml90(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml173(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml129(td)
@ -14580,7 +14567,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml104(td)
-#: ./doc/common/tables/cinder-database.xml108(td)
+#: ./doc/common/tables/cinder-database.xml104(td)
 #: ./doc/common/tables/glance-database.xml93(td)
 #: ./doc/common/tables/neutron-database.xml93(td)
 #: ./doc/common/tables/nova-database.xml104(td)
@ -14590,7 +14577,6 @@ msgid "use_db_reconnect = False"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml105(td)
-#: ./doc/common/tables/cinder-database.xml109(td)
 #: ./doc/common/tables/glance-database.xml94(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml177(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml133(td)
@ -14605,13 +14591,13 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml108(td)
-#: ./doc/common/tables/cinder-database.xml112(td)
+#: ./doc/common/tables/cinder-database.xml108(td)
 #: ./doc/common/tables/nova-database.xml108(td)
 msgid "use_tpool = False"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml109(td)
-#: ./doc/common/tables/cinder-database.xml113(td)
+#: ./doc/common/tables/cinder-database.xml109(td)
 #: ./doc/common/tables/nova-database.xml109(td)
 msgid ""
 "(BoolOpt) Enable the experimental use of thread pooling for all DB API calls"
@ -17690,7 +17676,6 @@ msgstr ""
 #: ./doc/common/tables/ceilometer-redis.xml21(td)
 #: ./doc/common/tables/nova-common.xml41(td)
 #: ./doc/common/tables/neutron-redis.xml21(td)
-#: ./doc/common/tables/cinder-common.xml57(td)
 #: ./doc/common/tables/heat-redis.xml21(td)
 msgid "host = oslo"
 msgstr "host = oslo"
@ -17707,75 +17692,85 @@ msgid "Description of configuration options for storage_ceph"
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml21(td)
-msgid "rbd_ceph_conf ="
+msgid "rados_connect_timeout = -1"
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml22(td)
-msgid "(StrOpt) Path to the ceph configuration file"
+msgid ""
+"(IntOpt) Timeout value (in seconds) used when connecting to ceph cluster. If"
+" value &lt; 0, no timeout is set and default librados value is used."
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml25(td)
-msgid "rbd_flatten_volume_from_snapshot = False"
+msgid "rbd_ceph_conf ="
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml26(td)
+msgid "(StrOpt) Path to the ceph configuration file"
+msgstr ""
+
+#: ./doc/common/tables/cinder-storage_ceph.xml29(td)
+msgid "rbd_flatten_volume_from_snapshot = False"
+msgstr ""
+
+#: ./doc/common/tables/cinder-storage_ceph.xml30(td)
 msgid ""
 "(BoolOpt) Flatten volumes created from snapshots to remove dependency from "
 "volume to snapshot"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml29(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml33(td)
 msgid "rbd_max_clone_depth = 5"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml30(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml34(td)
 msgid ""
 "(IntOpt) Maximum number of nested volume clones that are taken before a "
 "flatten occurs. Set to 0 to disable cloning."
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml33(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml37(td)
 msgid "rbd_pool = rbd"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml34(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml38(td)
 msgid "(StrOpt) The RADOS pool where rbd volumes are stored"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml37(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml41(td)
 #: ./doc/common/tables/nova-volumes.xml118(td)
 msgid "rbd_secret_uuid = None"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml38(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml42(td)
 msgid "(StrOpt) The libvirt uuid of the secret for the rbd_user volumes"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml41(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml45(td)
 msgid "rbd_store_chunk_size = 4"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml42(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml46(td)
 msgid ""
 "(IntOpt) Volumes will be chunked into objects of this size (in megabytes)."
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml45(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml49(td)
 #: ./doc/common/tables/nova-volumes.xml122(td)
 msgid "rbd_user = None"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml46(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml50(td)
 msgid ""
 "(StrOpt) The RADOS client name for accessing rbd volumes - only set when "
 "using cephx authentication"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml49(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml53(td)
 msgid "volume_tmp_dir = None"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml50(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml54(td)
 msgid ""
 "(StrOpt) Directory where temporary image files are stored when the volume "
 "driver does not write them directly to the volume."
@ -18788,20 +18783,111 @@ msgstr ""
 msgid "(StrOpt) Driver to use for database access"
 msgstr ""

-#: ./doc/common/tables/cinder-database.xml29(td)
-msgid "sqlite_clean_db = clean.sqlite"
+#: ./doc/common/tables/cinder-database.xml33(td)
+#: ./doc/common/tables/keystone-database.xml22(td)
+msgid "(StrOpt) The back end to use for the database."
 msgstr ""

-#: ./doc/common/tables/cinder-database.xml30(td)
-msgid "(StrOpt) File name of clean sqlite db"
-msgstr "(StrOpt) Nom de fichier de clean sqlite db"
-
-#: ./doc/common/tables/cinder-database.xml40(td)
-msgid "connection = sqlite:///$state_path/$sqlite_db"
+#: ./doc/common/tables/cinder-database.xml37(td)
+#: ./doc/common/tables/keystone-database.xml26(td)
+msgid ""
+"(StrOpt) The SQLAlchemy connection string to use to connect to the database."
 msgstr ""

-#: ./doc/common/tables/cinder-database.xml100(td)
-msgid "sqlite_db = cinder.sqlite"
+#: ./doc/common/tables/cinder-database.xml41(td)
+#: ./doc/common/tables/keystone-database.xml30(td)
+msgid ""
+"(IntOpt) Verbosity of SQL debugging information: 0=None, 100=Everything."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml45(td)
+#: ./doc/common/tables/keystone-database.xml34(td)
+msgid "(BoolOpt) Add Python stack traces to SQL as comment strings."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml49(td)
+#: ./doc/common/tables/keystone-database.xml38(td)
+msgid ""
+"(BoolOpt) If True, increases the interval between database connection "
+"retries up to db_max_retry_interval."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml53(td)
+#: ./doc/common/tables/keystone-database.xml42(td)
+msgid ""
+"(IntOpt) Maximum database connection retries before error is raised. Set to "
+"-1 to specify an infinite retry count."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml57(td)
+#: ./doc/common/tables/keystone-database.xml46(td)
+msgid ""
+"(IntOpt) If db_inc_retry_interval is set, the maximum seconds between "
+"database connection retries."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml61(td)
+#: ./doc/common/tables/keystone-database.xml50(td)
+msgid "(IntOpt) Seconds between database connection retries."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml65(td)
+#: ./doc/common/tables/keystone-database.xml54(td)
+msgid "(IntOpt) Timeout before idle SQL connections are reaped."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml69(td)
+#: ./doc/common/tables/keystone-database.xml58(td)
+msgid "(IntOpt) If set, use this value for max_overflow with SQLAlchemy."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml73(td)
+#: ./doc/common/tables/keystone-database.xml62(td)
+msgid "(IntOpt) Maximum number of SQL connections to keep open in a pool."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml77(td)
+#: ./doc/common/tables/keystone-database.xml66(td)
+msgid ""
+"(IntOpt) Maximum db connection retries during startup. Set to -1 to specify "
+"an infinite retry count."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml81(td)
+#: ./doc/common/tables/keystone-database.xml70(td)
+msgid "(IntOpt) Minimum number of SQL connections to keep open in a pool."
+msgstr "(IntOpt) Nombre minimum de connexions SQL à garder ouvertes dans un pool"
+
+#: ./doc/common/tables/cinder-database.xml89(td)
+#: ./doc/common/tables/keystone-database.xml78(td)
+msgid "(IntOpt) If set, use this value for pool_timeout with SQLAlchemy."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml93(td)
+#: ./doc/common/tables/keystone-database.xml82(td)
+msgid "(IntOpt) Interval between retries of opening a SQL connection."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml96(td)
+#: ./doc/common/tables/keystone-database.xml89(td)
+msgid "sqlite_db = oslo.sqlite"
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml97(td)
+#: ./doc/common/tables/keystone-database.xml90(td)
+msgid "(StrOpt) The file name to use with SQLite."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml101(td)
+#: ./doc/common/tables/keystone-database.xml94(td)
+msgid "(BoolOpt) If True, SQLite uses synchronous mode."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml105(td)
+#: ./doc/common/tables/keystone-database.xml98(td)
+msgid ""
+"(BoolOpt) Enable the experimental use of database reconnect on connection "
+"lost."
 msgstr ""

 #: ./doc/common/tables/ceilometer-logging.xml7(caption)
@ -19202,6 +19288,7 @@ msgstr ""

 #: ./doc/common/tables/ceilometer-logging.xml86(td)
 #: ./doc/common/tables/neutron-logging.xml94(td)
+#: ./doc/common/tables/cinder-common.xml218(td)
 #: ./doc/common/tables/heat-logging.xml78(td)
 #: ./doc/common/tables/nova-logging.xml94(td)
 msgid ""
@ -24246,7 +24333,6 @@ msgstr ""
 #: ./doc/common/tables/keystone-zeromq.xml29(td)
 #: ./doc/common/tables/ceilometer-rpc.xml65(td)
 #: ./doc/common/tables/glance-zmq.xml33(td)
-#: ./doc/common/tables/cinder-rpc.xml209(td)
 #: ./doc/common/tables/trove-zeromq.xml29(td)
 #: ./doc/common/tables/nova-rpc_all.xml177(td)
 msgid "rpc_zmq_host = oslo"
@ -24397,7 +24483,9 @@ msgid "iscsi_helper = tgtadm"
 msgstr ""

 #: ./doc/common/tables/cinder-storage.xml34(td)
-msgid "(StrOpt) iSCSI target user-land tool to use"
+msgid ""
+"(StrOpt) iSCSI target user-land tool to use. tgtadm is default, use lioadm "
+"for LIO iSCSI support, iseradm for the ISER protocol, or fake for testing."
 msgstr ""

 #: ./doc/common/tables/cinder-storage.xml37(td)
@ -25469,7 +25557,7 @@ msgid "volume_api_class = nova.volume.cinder.API"
 msgstr ""

 #: ./doc/common/tables/nova-volumes.xml54(td)
-#: ./doc/common/tables/cinder-api.xml86(td)
+#: ./doc/common/tables/cinder-api.xml90(td)
 msgid "(StrOpt) The full class name of the volume API class to use"
 msgstr ""

@ -30004,8 +30092,8 @@ msgstr ""

 #: ./doc/common/tables/cinder-lvm.xml22(td)
 msgid ""
-"(IntOpt) If set, create lvms with multiple mirrors. Note that this requires "
-"lvm_mirrors + 2 pvs with available space"
+"(IntOpt) If &gt;0, create LVs with multiple mirrors. Note that this requires"
+" lvm_mirrors + 2 PVs with available space"
 msgstr ""

 #: ./doc/common/tables/cinder-lvm.xml25(td)
@ -30497,6 +30585,26 @@ msgid ""
 "volumes can be allocated to the volume destination."
 msgstr ""

+#: ./doc/common/tables/cinder-hds-hnas.xml7(caption)
+msgid "Description of configuration options for hds-hnas"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml21(td)
+msgid "hds_hnas_iscsi_config_file = /opt/hds/hnas/cinder_iscsi_conf.xml"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml22(td)
+msgid "(StrOpt) configuration file for HDS iSCSI cinder plugin"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml25(td)
+msgid "hds_hnas_nfs_config_file = /opt/hds/hnas/cinder_nfs_conf.xml"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml26(td)
+msgid "(StrOpt) configuration file for HDS NFS cinder plugin"
+msgstr ""
+
 #: ./doc/common/tables/heat-api.xml25(td)
 msgid "heat_stack_user_role = heat_stack_user"
 msgstr "heat_stack_user_role = heat_stack_user"
@ -30789,7 +30897,6 @@ msgid "(IntOpt) Minimum tunnel ID to use"
 msgstr ""

 #: ./doc/common/tables/glance-logging.xml90(td)
-#: ./doc/common/tables/cinder-common.xml218(td)
 #: ./doc/common/tables/keystone-logging.xml78(td)
 msgid ""
 "(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED "
@ -30907,6 +31014,10 @@ msgstr ""
 msgid "(BoolOpt) make exception message format errors fatal"
 msgstr ""

+#: ./doc/common/tables/cinder-common.xml57(td)
+msgid "host = localhost"
+msgstr ""
+
 #: ./doc/common/tables/cinder-common.xml58(td)
 msgid ""
 "(StrOpt) Name of this node. This can be an opaque identifier. It is not "
@ -32672,38 +32783,59 @@ msgid "(IntOpt) Port on which OpenStack Volume API listens"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml81(td)
-msgid "transfer_api_class = cinder.transfer.api.API"
-msgstr "transfer_api_class = cinder.transfer.api.API"
+#: ./doc/common/tables/cinder-conf-changes-icehouse.xml144(td)
+msgid "osapi_volume_workers = None"
+msgstr "osapi_volume_workers = None"

 #: ./doc/common/tables/cinder-api.xml82(td)
-msgid "(StrOpt) The full class name of the volume transfer API class"
+msgid ""
+"(IntOpt) Number of workers for OpenStack Volume API service. The default is "
+"equal to the number of CPUs available."
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml85(td)
+msgid "transfer_api_class = cinder.transfer.api.API"
+msgstr "transfer_api_class = cinder.transfer.api.API"
+
+#: ./doc/common/tables/cinder-api.xml86(td)
+msgid "(StrOpt) The full class name of the volume transfer API class"
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml89(td)
 msgid "volume_api_class = cinder.volume.api.API"
 msgstr "volume_api_class = cinder.volume.api.API"

-#: ./doc/common/tables/cinder-api.xml89(td)
+#: ./doc/common/tables/cinder-api.xml93(td)
 msgid "volume_name_template = volume-%s"
 msgstr "volume_name_template = volume-%s"

-#: ./doc/common/tables/cinder-api.xml90(td)
+#: ./doc/common/tables/cinder-api.xml94(td)
 msgid "(StrOpt) Template string to be used to generate volume names"
 msgstr ""

-#: ./doc/common/tables/cinder-api.xml93(td)
-msgid "volume_transfer_key_length = 16"
-msgstr ""
-
-#: ./doc/common/tables/cinder-api.xml94(td)
-msgid "(IntOpt) The number of characters in the autogenerated auth key."
-msgstr ""
-
 #: ./doc/common/tables/cinder-api.xml97(td)
-msgid "volume_transfer_salt_length = 8"
+msgid "volume_number_multiplier = -1.0"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml98(td)
+msgid ""
+"(FloatOpt) Multiplier used for weighing volume number. Negative numbers mean"
+" to spread vs stack."
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml101(td)
+msgid "volume_transfer_key_length = 16"
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml102(td)
+msgid "(IntOpt) The number of characters in the autogenerated auth key."
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml105(td)
+msgid "volume_transfer_salt_length = 8"
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml106(td)
 msgid "(IntOpt) The number of characters in the salt."
 msgstr ""

@ -36208,22 +36340,6 @@ msgstr ""
 msgid "(StrOpt) The configuration file for the Cinder HDS driver for HUS"
 msgstr ""

-#: ./doc/common/tables/cinder-hds-hus.xml25(td)
-msgid "hds_hnas_iscsi_config_file = /opt/hds/hnas/cinder_iscsi_conf.xml"
-msgstr ""
-
-#: ./doc/common/tables/cinder-hds-hus.xml26(td)
-msgid "(StrOpt) configuration file for HDS iSCSI cinder plugin"
-msgstr ""
-
-#: ./doc/common/tables/cinder-hds-hus.xml29(td)
-msgid "hds_hnas_nfs_config_file = /opt/hds/hnas/cinder_nfs_conf.xml"
-msgstr ""
-
-#: ./doc/common/tables/cinder-hds-hus.xml30(td)
-msgid "(StrOpt) configuration file for HDS NFS cinder plugin"
-msgstr ""
-
 #: ./doc/common/tables/cinder-netapp_7mode_iscsi.xml7(caption)
 msgid "Description of configuration options for netapp_7mode_iscsi"
 msgstr ""
@ -36933,6 +37049,10 @@ msgstr ""
 msgid "(IntOpt) Default Time Out For CLI operations in minutes"
 msgstr ""

+#: ./doc/common/tables/cinder-rpc.xml209(td)
+msgid "rpc_zmq_host = localhost"
+msgstr ""
+
 #: ./doc/common/tables/cinder-rpc.xml233(td)
 msgid "volume_topic = cinder-volume"
 msgstr "volume_topic = cinder-volume"
@ -39760,10 +39880,6 @@ msgstr ""
 msgid "(IntOpt) TCP Buffer size in KiloBytes."
 msgstr ""

-#: ./doc/common/tables/cinder-conf-changes-icehouse.xml144(td)
-msgid "osapi_volume_workers = None"
-msgstr "osapi_volume_workers = None"
-
 #: ./doc/common/tables/cinder-conf-changes-icehouse.xml145(td)
 msgid "(IntOpt) Number of workers for OpenStack Volume API service"
 msgstr ""
@ -42914,100 +43030,12 @@ msgid ""
 "neutron.ml2.type_drivers namespace."
 msgstr ""

-#: ./doc/common/tables/keystone-database.xml22(td)
-msgid "(StrOpt) The back end to use for the database."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml26(td)
-msgid ""
-"(StrOpt) The SQLAlchemy connection string to use to connect to the database."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml30(td)
-msgid ""
-"(IntOpt) Verbosity of SQL debugging information: 0=None, 100=Everything."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml34(td)
-msgid "(BoolOpt) Add Python stack traces to SQL as comment strings."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml38(td)
-msgid ""
-"(BoolOpt) If True, increases the interval between database connection "
-"retries up to db_max_retry_interval."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml42(td)
-msgid ""
-"(IntOpt) Maximum database connection retries before error is raised. Set to "
-"-1 to specify an infinite retry count."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml46(td)
-msgid ""
-"(IntOpt) If db_inc_retry_interval is set, the maximum seconds between "
-"database connection retries."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml50(td)
-msgid "(IntOpt) Seconds between database connection retries."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml54(td)
-msgid "(IntOpt) Timeout before idle SQL connections are reaped."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml58(td)
-msgid "(IntOpt) If set, use this value for max_overflow with SQLAlchemy."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml62(td)
-msgid "(IntOpt) Maximum number of SQL connections to keep open in a pool."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml66(td)
-msgid ""
-"(IntOpt) Maximum db connection retries during startup. Set to -1 to specify "
-"an infinite retry count."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml70(td)
-msgid "(IntOpt) Minimum number of SQL connections to keep open in a pool."
-msgstr "(IntOpt) Nombre minimum de connexions SQL à garder ouvertes dans un pool"
-
-#: ./doc/common/tables/keystone-database.xml78(td)
-msgid "(IntOpt) If set, use this value for pool_timeout with SQLAlchemy."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml82(td)
-msgid "(IntOpt) Interval between retries of opening a SQL connection."
-msgstr ""
-
 #: ./doc/common/tables/keystone-database.xml86(td)
 msgid ""
 "(StrOpt) The SQLAlchemy connection string to use to connect to the slave "
 "database."
 msgstr ""

-#: ./doc/common/tables/keystone-database.xml89(td)
-msgid "sqlite_db = oslo.sqlite"
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml90(td)
-msgid "(StrOpt) The file name to use with SQLite."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml94(td)
-msgid "(BoolOpt) If True, SQLite uses synchronous mode."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml98(td)
-msgid ""
-"(BoolOpt) Enable the experimental use of database reconnect on connection "
-"lost."
-msgstr ""
-
 #: ./doc/common/tables/keystone-memcache.xml7(caption)
 msgid "Description of configuration options for memcache"
 msgstr ""
--- a/doc/common/locale/ja.po
+++ b/doc/common/locale/ja.po
@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-07-25 00:50+0000\n"
-"PO-Revision-Date: 2014-07-24 10:30+0000\n"
-"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
+"POT-Creation-Date: 2014-07-27 05:14+0000\n"
+"PO-Revision-Date: 2014-07-26 18:41+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -582,6 +582,7 @@ msgstr ""
 #: ./doc/common/tables/neutron-quotas.xml13(th)
 #: ./doc/common/tables/nova-auth_token.xml13(th)
 #: ./doc/common/tables/cinder-storage_nfs.xml13(th)
+#: ./doc/common/tables/cinder-hds-hnas.xml13(th)
 #: ./doc/common/tables/heat-api.xml13(th)
 #: ./doc/common/tables/swift-proxy-server-filter-tempurl.xml15(th)
 #: ./doc/common/tables/heat-clients_ceilometer.xml13(th)
@ -10983,6 +10984,7 @@ msgstr ""
 #: ./doc/common/tables/heat-auth_token.xml18(th)
 #: ./doc/common/tables/neutron-quotas.xml18(th)
 #: ./doc/common/tables/cinder-storage_nfs.xml18(th)
+#: ./doc/common/tables/cinder-hds-hnas.xml18(th)
 #: ./doc/common/tables/heat-api.xml18(th)
 #: ./doc/common/tables/glance-logging.xml18(th)
 #: ./doc/common/tables/neutron-metering_agent.xml18(th)
@ -11112,7 +11114,7 @@ msgstr ""

 #: ./doc/common/section_config_format.xml146(literal)
 #: ./doc/common/tables/ceilometer-database.xml25(th)
-#: ./doc/common/tables/cinder-database.xml33(th)
+#: ./doc/common/tables/cinder-database.xml29(th)
 #: ./doc/common/tables/glance-database.xml18(th)
 #: ./doc/common/tables/neutron-database.xml18(th)
 #: ./doc/common/tables/nova-database.xml25(th)
@ -13943,6 +13945,7 @@ msgstr ""
 #: ./doc/common/tables/neutron-quotas.xml12(th)
 #: ./doc/common/tables/nova-auth_token.xml12(th)
 #: ./doc/common/tables/cinder-storage_nfs.xml12(th)
+#: ./doc/common/tables/cinder-hds-hnas.xml12(th)
 #: ./doc/common/tables/heat-api.xml12(th)
 #: ./doc/common/tables/swift-proxy-server-filter-tempurl.xml14(th)
 #: ./doc/common/tables/heat-clients_ceilometer.xml12(th)
@ -14177,7 +14180,7 @@ msgid "(StrOpt) DEPRECATED - Database connection string."
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml28(td)
-#: ./doc/common/tables/cinder-database.xml36(td)
+#: ./doc/common/tables/cinder-database.xml32(td)
 #: ./doc/common/tables/glance-database.xml21(td)
 #: ./doc/common/tables/neutron-database.xml21(td)
 #: ./doc/common/tables/nova-database.xml28(td)
@ -14188,7 +14191,6 @@ msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml29(td)
 #: ./doc/common/tables/cinder-database.xml22(td)
-#: ./doc/common/tables/cinder-database.xml37(td)
 #: ./doc/common/tables/glance-database.xml22(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml105(td)
 #: ./doc/common/tables/neutron-database.xml22(td)
@ -14198,6 +14200,7 @@ msgid "(StrOpt) The backend to use for db"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml32(td)
+#: ./doc/common/tables/cinder-database.xml36(td)
 #: ./doc/common/tables/glance-database.xml25(td)
 #: ./doc/common/tables/nova-database.xml32(td)
 #: ./doc/common/tables/heat-database.xml25(td)
@ -14206,7 +14209,6 @@ msgid "connection = None"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml33(td)
-#: ./doc/common/tables/cinder-database.xml41(td)
 #: ./doc/common/tables/glance-database.xml26(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml109(td)
 #: ./doc/common/tables/neutron-database.xml26(td)
@ -14217,7 +14219,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml36(td)
-#: ./doc/common/tables/cinder-database.xml44(td)
+#: ./doc/common/tables/cinder-database.xml40(td)
 #: ./doc/common/tables/glance-database.xml29(td)
 #: ./doc/common/tables/neutron-database.xml29(td)
 #: ./doc/common/tables/nova-database.xml36(td)
@ -14227,7 +14229,6 @@ msgid "connection_debug = 0"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml37(td)
-#: ./doc/common/tables/cinder-database.xml45(td)
 #: ./doc/common/tables/glance-database.xml30(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml113(td)
 #: ./doc/common/tables/neutron-database.xml30(td)
@ -14238,7 +14239,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml40(td)
-#: ./doc/common/tables/cinder-database.xml48(td)
+#: ./doc/common/tables/cinder-database.xml44(td)
 #: ./doc/common/tables/glance-database.xml33(td)
 #: ./doc/common/tables/neutron-database.xml33(td)
 #: ./doc/common/tables/nova-database.xml40(td)
@ -14248,7 +14249,6 @@ msgid "connection_trace = False"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml41(td)
-#: ./doc/common/tables/cinder-database.xml49(td)
 #: ./doc/common/tables/glance-database.xml34(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml117(td)
 #: ./doc/common/tables/neutron-database.xml34(td)
@ -14258,7 +14258,7 @@ msgid "(BoolOpt) Add python stack traces to SQL as comment strings"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml44(td)
-#: ./doc/common/tables/cinder-database.xml52(td)
+#: ./doc/common/tables/cinder-database.xml48(td)
 #: ./doc/common/tables/glance-database.xml37(td)
 #: ./doc/common/tables/neutron-database.xml37(td)
 #: ./doc/common/tables/nova-database.xml44(td)
@ -14268,7 +14268,6 @@ msgid "db_inc_retry_interval = True"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml45(td)
-#: ./doc/common/tables/cinder-database.xml53(td)
 #: ./doc/common/tables/glance-database.xml38(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml121(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml105(td)
@ -14283,7 +14282,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml48(td)
-#: ./doc/common/tables/cinder-database.xml56(td)
+#: ./doc/common/tables/cinder-database.xml52(td)
 #: ./doc/common/tables/glance-database.xml41(td)
 #: ./doc/common/tables/neutron-database.xml41(td)
 #: ./doc/common/tables/nova-database.xml48(td)
@ -14293,7 +14292,6 @@ msgid "db_max_retries = 20"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml49(td)
-#: ./doc/common/tables/cinder-database.xml57(td)
 #: ./doc/common/tables/glance-database.xml42(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml125(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml109(td)
@ -14308,7 +14306,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml52(td)
-#: ./doc/common/tables/cinder-database.xml60(td)
+#: ./doc/common/tables/cinder-database.xml56(td)
 #: ./doc/common/tables/glance-database.xml45(td)
 #: ./doc/common/tables/neutron-database.xml45(td)
 #: ./doc/common/tables/nova-database.xml52(td)
@ -14318,7 +14316,6 @@ msgid "db_max_retry_interval = 10"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml53(td)
-#: ./doc/common/tables/cinder-database.xml61(td)
 #: ./doc/common/tables/glance-database.xml46(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml129(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml113(td)
@ -14333,7 +14330,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml56(td)
-#: ./doc/common/tables/cinder-database.xml64(td)
+#: ./doc/common/tables/cinder-database.xml60(td)
 #: ./doc/common/tables/glance-database.xml49(td)
 #: ./doc/common/tables/neutron-database.xml49(td)
 #: ./doc/common/tables/nova-database.xml56(td)
@ -14343,7 +14340,6 @@ msgid "db_retry_interval = 1"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml57(td)
-#: ./doc/common/tables/cinder-database.xml65(td)
 #: ./doc/common/tables/glance-database.xml50(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml133(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml117(td)
@ -14356,7 +14352,7 @@ msgid "(IntOpt) seconds between db connection retries"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml60(td)
-#: ./doc/common/tables/cinder-database.xml68(td)
+#: ./doc/common/tables/cinder-database.xml64(td)
 #: ./doc/common/tables/glance-database.xml53(td)
 #: ./doc/common/tables/neutron-database.xml53(td)
 #: ./doc/common/tables/nova-database.xml60(td)
@ -14366,7 +14362,6 @@ msgid "idle_timeout = 3600"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml61(td)
-#: ./doc/common/tables/cinder-database.xml69(td)
 #: ./doc/common/tables/glance-database.xml54(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml137(td)
 #: ./doc/common/tables/neutron-database.xml54(td)
@ -14376,7 +14371,7 @@ msgid "(IntOpt) Timeout before idle sql connections are reaped"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml64(td)
-#: ./doc/common/tables/cinder-database.xml72(td)
+#: ./doc/common/tables/cinder-database.xml68(td)
 #: ./doc/common/tables/glance-database.xml57(td)
 #: ./doc/common/tables/nova-database.xml64(td)
 #: ./doc/common/tables/heat-database.xml57(td)
@ -14385,7 +14380,6 @@ msgid "max_overflow = None"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml65(td)
-#: ./doc/common/tables/cinder-database.xml73(td)
 #: ./doc/common/tables/glance-database.xml58(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml141(td)
 #: ./doc/common/tables/neutron-database.xml58(td)
@ -14395,7 +14389,7 @@ msgid "(IntOpt) If set, use this value for max_overflow with sqlalchemy"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml68(td)
-#: ./doc/common/tables/cinder-database.xml76(td)
+#: ./doc/common/tables/cinder-database.xml72(td)
 #: ./doc/common/tables/glance-database.xml61(td)
 #: ./doc/common/tables/nova-database.xml68(td)
 #: ./doc/common/tables/heat-database.xml61(td)
@ -14404,7 +14398,6 @@ msgid "max_pool_size = None"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml69(td)
-#: ./doc/common/tables/cinder-database.xml77(td)
 #: ./doc/common/tables/glance-database.xml62(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml145(td)
 #: ./doc/common/tables/neutron-database.xml62(td)
@ -14414,7 +14407,7 @@ msgid "(IntOpt) Maximum number of SQL connections to keep open in a pool"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml72(td)
-#: ./doc/common/tables/cinder-database.xml80(td)
+#: ./doc/common/tables/cinder-database.xml76(td)
 #: ./doc/common/tables/glance-database.xml65(td)
 #: ./doc/common/tables/neutron-database.xml65(td)
 #: ./doc/common/tables/nova-database.xml72(td)
@ -14424,7 +14417,6 @@ msgid "max_retries = 10"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml73(td)
-#: ./doc/common/tables/cinder-database.xml81(td)
 #: ./doc/common/tables/glance-database.xml66(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml149(td)
 #: ./doc/common/tables/neutron-database.xml66(td)
@ -14436,7 +14428,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml76(td)
-#: ./doc/common/tables/cinder-database.xml84(td)
+#: ./doc/common/tables/cinder-database.xml80(td)
 #: ./doc/common/tables/glance-database.xml69(td)
 #: ./doc/common/tables/neutron-database.xml69(td)
 #: ./doc/common/tables/nova-database.xml76(td)
@ -14446,7 +14438,6 @@ msgid "min_pool_size = 1"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml77(td)
-#: ./doc/common/tables/cinder-database.xml85(td)
 #: ./doc/common/tables/glance-database.xml70(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml153(td)
 #: ./doc/common/tables/neutron-database.xml70(td)
@ -14456,7 +14447,7 @@ msgid "(IntOpt) Minimum number of SQL connections to keep open in a pool"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml80(td)
-#: ./doc/common/tables/cinder-database.xml88(td)
+#: ./doc/common/tables/cinder-database.xml84(td)
 #: ./doc/common/tables/glance-database.xml73(td)
 #: ./doc/common/tables/neutron-database.xml73(td)
 #: ./doc/common/tables/nova-database.xml80(td)
@ -14466,7 +14457,7 @@ msgid "mysql_sql_mode = TRADITIONAL"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml81(td)
-#: ./doc/common/tables/cinder-database.xml89(td)
+#: ./doc/common/tables/cinder-database.xml85(td)
 #: ./doc/common/tables/glance-database.xml74(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml157(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml121(td)
@ -14482,7 +14473,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml84(td)
-#: ./doc/common/tables/cinder-database.xml92(td)
+#: ./doc/common/tables/cinder-database.xml88(td)
 #: ./doc/common/tables/glance-database.xml77(td)
 #: ./doc/common/tables/nova-database.xml84(td)
 #: ./doc/common/tables/heat-database.xml77(td)
@ -14491,7 +14482,6 @@ msgid "pool_timeout = None"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml85(td)
-#: ./doc/common/tables/cinder-database.xml93(td)
 #: ./doc/common/tables/glance-database.xml78(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml161(td)
 #: ./doc/common/tables/neutron-database.xml78(td)
@ -14501,7 +14491,7 @@ msgid "(IntOpt) If set, use this value for pool_timeout with sqlalchemy"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml88(td)
-#: ./doc/common/tables/cinder-database.xml96(td)
+#: ./doc/common/tables/cinder-database.xml92(td)
 #: ./doc/common/tables/glance-database.xml81(td)
 #: ./doc/common/tables/neutron-database.xml81(td)
 #: ./doc/common/tables/nova-database.xml88(td)
@ -14511,7 +14501,6 @@ msgid "retry_interval = 10"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml89(td)
-#: ./doc/common/tables/cinder-database.xml97(td)
 #: ./doc/common/tables/glance-database.xml82(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml165(td)
 #: ./doc/common/tables/neutron-database.xml82(td)
@ -14525,7 +14514,6 @@ msgid "sqlite_db = ceilometer.sqlite"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml93(td)
-#: ./doc/common/tables/cinder-database.xml101(td)
 #: ./doc/common/tables/glance-database.xml86(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml169(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml125(td)
@ -14537,7 +14525,7 @@ msgid "(StrOpt) The file name to use with SQLite"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml96(td)
-#: ./doc/common/tables/cinder-database.xml104(td)
+#: ./doc/common/tables/cinder-database.xml100(td)
 #: ./doc/common/tables/glance-database.xml89(td)
 #: ./doc/common/tables/neutron-database.xml89(td)
 #: ./doc/common/tables/nova-database.xml100(td)
@ -14547,7 +14535,6 @@ msgid "sqlite_synchronous = True"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml97(td)
-#: ./doc/common/tables/cinder-database.xml105(td)
 #: ./doc/common/tables/glance-database.xml90(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml173(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml129(td)
@ -14569,7 +14556,7 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml104(td)
-#: ./doc/common/tables/cinder-database.xml108(td)
+#: ./doc/common/tables/cinder-database.xml104(td)
 #: ./doc/common/tables/glance-database.xml93(td)
 #: ./doc/common/tables/neutron-database.xml93(td)
 #: ./doc/common/tables/nova-database.xml104(td)
@ -14579,7 +14566,6 @@ msgid "use_db_reconnect = False"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml105(td)
-#: ./doc/common/tables/cinder-database.xml109(td)
 #: ./doc/common/tables/glance-database.xml94(td)
 #: ./doc/common/tables/glance-conf-changes-icehouse.xml177(td)
 #: ./doc/common/tables/keystone-conf-changes-icehouse.xml133(td)
@ -14594,13 +14580,13 @@ msgid ""
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml108(td)
-#: ./doc/common/tables/cinder-database.xml112(td)
+#: ./doc/common/tables/cinder-database.xml108(td)
 #: ./doc/common/tables/nova-database.xml108(td)
 msgid "use_tpool = False"
 msgstr ""

 #: ./doc/common/tables/ceilometer-database.xml109(td)
-#: ./doc/common/tables/cinder-database.xml113(td)
+#: ./doc/common/tables/cinder-database.xml109(td)
 #: ./doc/common/tables/nova-database.xml109(td)
 msgid ""
 "(BoolOpt) Enable the experimental use of thread pooling for all DB API calls"
@ -17679,7 +17665,6 @@ msgstr ""
 #: ./doc/common/tables/ceilometer-redis.xml21(td)
 #: ./doc/common/tables/nova-common.xml41(td)
 #: ./doc/common/tables/neutron-redis.xml21(td)
-#: ./doc/common/tables/cinder-common.xml57(td)
 #: ./doc/common/tables/heat-redis.xml21(td)
 msgid "host = oslo"
 msgstr ""
@ -17696,75 +17681,85 @@ msgid "Description of configuration options for storage_ceph"
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml21(td)
-msgid "rbd_ceph_conf ="
+msgid "rados_connect_timeout = -1"
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml22(td)
-msgid "(StrOpt) Path to the ceph configuration file"
+msgid ""
+"(IntOpt) Timeout value (in seconds) used when connecting to ceph cluster. If"
+" value &lt; 0, no timeout is set and default librados value is used."
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml25(td)
-msgid "rbd_flatten_volume_from_snapshot = False"
+msgid "rbd_ceph_conf ="
 msgstr ""

 #: ./doc/common/tables/cinder-storage_ceph.xml26(td)
+msgid "(StrOpt) Path to the ceph configuration file"
+msgstr ""
+
+#: ./doc/common/tables/cinder-storage_ceph.xml29(td)
+msgid "rbd_flatten_volume_from_snapshot = False"
+msgstr ""
+
+#: ./doc/common/tables/cinder-storage_ceph.xml30(td)
 msgid ""
 "(BoolOpt) Flatten volumes created from snapshots to remove dependency from "
 "volume to snapshot"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml29(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml33(td)
 msgid "rbd_max_clone_depth = 5"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml30(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml34(td)
 msgid ""
 "(IntOpt) Maximum number of nested volume clones that are taken before a "
 "flatten occurs. Set to 0 to disable cloning."
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml33(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml37(td)
 msgid "rbd_pool = rbd"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml34(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml38(td)
 msgid "(StrOpt) The RADOS pool where rbd volumes are stored"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml37(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml41(td)
 #: ./doc/common/tables/nova-volumes.xml118(td)
 msgid "rbd_secret_uuid = None"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml38(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml42(td)
 msgid "(StrOpt) The libvirt uuid of the secret for the rbd_user volumes"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml41(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml45(td)
 msgid "rbd_store_chunk_size = 4"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml42(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml46(td)
 msgid ""
 "(IntOpt) Volumes will be chunked into objects of this size (in megabytes)."
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml45(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml49(td)
 #: ./doc/common/tables/nova-volumes.xml122(td)
 msgid "rbd_user = None"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml46(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml50(td)
 msgid ""
 "(StrOpt) The RADOS client name for accessing rbd volumes - only set when "
 "using cephx authentication"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml49(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml53(td)
 msgid "volume_tmp_dir = None"
 msgstr ""

-#: ./doc/common/tables/cinder-storage_ceph.xml50(td)
+#: ./doc/common/tables/cinder-storage_ceph.xml54(td)
 msgid ""
 "(StrOpt) Directory where temporary image files are stored when the volume "
 "driver does not write them directly to the volume."
@ -18777,20 +18772,111 @@ msgstr ""
 msgid "(StrOpt) Driver to use for database access"
 msgstr ""

-#: ./doc/common/tables/cinder-database.xml29(td)
-msgid "sqlite_clean_db = clean.sqlite"
+#: ./doc/common/tables/cinder-database.xml33(td)
+#: ./doc/common/tables/keystone-database.xml22(td)
+msgid "(StrOpt) The back end to use for the database."
 msgstr ""

-#: ./doc/common/tables/cinder-database.xml30(td)
-msgid "(StrOpt) File name of clean sqlite db"
+#: ./doc/common/tables/cinder-database.xml37(td)
+#: ./doc/common/tables/keystone-database.xml26(td)
+msgid ""
+"(StrOpt) The SQLAlchemy connection string to use to connect to the database."
 msgstr ""

-#: ./doc/common/tables/cinder-database.xml40(td)
-msgid "connection = sqlite:///$state_path/$sqlite_db"
+#: ./doc/common/tables/cinder-database.xml41(td)
+#: ./doc/common/tables/keystone-database.xml30(td)
+msgid ""
+"(IntOpt) Verbosity of SQL debugging information: 0=None, 100=Everything."
 msgstr ""

-#: ./doc/common/tables/cinder-database.xml100(td)
-msgid "sqlite_db = cinder.sqlite"
+#: ./doc/common/tables/cinder-database.xml45(td)
+#: ./doc/common/tables/keystone-database.xml34(td)
+msgid "(BoolOpt) Add Python stack traces to SQL as comment strings."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml49(td)
+#: ./doc/common/tables/keystone-database.xml38(td)
+msgid ""
+"(BoolOpt) If True, increases the interval between database connection "
+"retries up to db_max_retry_interval."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml53(td)
+#: ./doc/common/tables/keystone-database.xml42(td)
+msgid ""
+"(IntOpt) Maximum database connection retries before error is raised. Set to "
+"-1 to specify an infinite retry count."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml57(td)
+#: ./doc/common/tables/keystone-database.xml46(td)
+msgid ""
+"(IntOpt) If db_inc_retry_interval is set, the maximum seconds between "
+"database connection retries."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml61(td)
+#: ./doc/common/tables/keystone-database.xml50(td)
+msgid "(IntOpt) Seconds between database connection retries."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml65(td)
+#: ./doc/common/tables/keystone-database.xml54(td)
+msgid "(IntOpt) Timeout before idle SQL connections are reaped."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml69(td)
+#: ./doc/common/tables/keystone-database.xml58(td)
+msgid "(IntOpt) If set, use this value for max_overflow with SQLAlchemy."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml73(td)
+#: ./doc/common/tables/keystone-database.xml62(td)
+msgid "(IntOpt) Maximum number of SQL connections to keep open in a pool."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml77(td)
+#: ./doc/common/tables/keystone-database.xml66(td)
+msgid ""
+"(IntOpt) Maximum db connection retries during startup. Set to -1 to specify "
+"an infinite retry count."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml81(td)
+#: ./doc/common/tables/keystone-database.xml70(td)
+msgid "(IntOpt) Minimum number of SQL connections to keep open in a pool."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml89(td)
+#: ./doc/common/tables/keystone-database.xml78(td)
+msgid "(IntOpt) If set, use this value for pool_timeout with SQLAlchemy."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml93(td)
+#: ./doc/common/tables/keystone-database.xml82(td)
+msgid "(IntOpt) Interval between retries of opening a SQL connection."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml96(td)
+#: ./doc/common/tables/keystone-database.xml89(td)
+msgid "sqlite_db = oslo.sqlite"
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml97(td)
+#: ./doc/common/tables/keystone-database.xml90(td)
+msgid "(StrOpt) The file name to use with SQLite."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml101(td)
+#: ./doc/common/tables/keystone-database.xml94(td)
+msgid "(BoolOpt) If True, SQLite uses synchronous mode."
+msgstr ""
+
+#: ./doc/common/tables/cinder-database.xml105(td)
+#: ./doc/common/tables/keystone-database.xml98(td)
+msgid ""
+"(BoolOpt) Enable the experimental use of database reconnect on connection "
+"lost."
 msgstr ""

 #: ./doc/common/tables/ceilometer-logging.xml7(caption)
@ -19191,6 +19277,7 @@ msgstr ""

 #: ./doc/common/tables/ceilometer-logging.xml86(td)
 #: ./doc/common/tables/neutron-logging.xml94(td)
+#: ./doc/common/tables/cinder-common.xml218(td)
 #: ./doc/common/tables/heat-logging.xml78(td)
 #: ./doc/common/tables/nova-logging.xml94(td)
 msgid ""
@ -24235,7 +24322,6 @@ msgstr ""
 #: ./doc/common/tables/keystone-zeromq.xml29(td)
 #: ./doc/common/tables/ceilometer-rpc.xml65(td)
 #: ./doc/common/tables/glance-zmq.xml33(td)
-#: ./doc/common/tables/cinder-rpc.xml209(td)
 #: ./doc/common/tables/trove-zeromq.xml29(td)
 #: ./doc/common/tables/nova-rpc_all.xml177(td)
 msgid "rpc_zmq_host = oslo"
@ -24386,7 +24472,9 @@ msgid "iscsi_helper = tgtadm"
 msgstr ""

 #: ./doc/common/tables/cinder-storage.xml34(td)
-msgid "(StrOpt) iSCSI target user-land tool to use"
+msgid ""
+"(StrOpt) iSCSI target user-land tool to use. tgtadm is default, use lioadm "
+"for LIO iSCSI support, iseradm for the ISER protocol, or fake for testing."
 msgstr ""

 #: ./doc/common/tables/cinder-storage.xml37(td)
@ -25458,7 +25546,7 @@ msgid "volume_api_class = nova.volume.cinder.API"
 msgstr ""

 #: ./doc/common/tables/nova-volumes.xml54(td)
-#: ./doc/common/tables/cinder-api.xml86(td)
+#: ./doc/common/tables/cinder-api.xml90(td)
 msgid "(StrOpt) The full class name of the volume API class to use"
 msgstr ""

@ -29993,8 +30081,8 @@ msgstr ""

 #: ./doc/common/tables/cinder-lvm.xml22(td)
 msgid ""
-"(IntOpt) If set, create lvms with multiple mirrors. Note that this requires "
-"lvm_mirrors + 2 pvs with available space"
+"(IntOpt) If &gt;0, create LVs with multiple mirrors. Note that this requires"
+" lvm_mirrors + 2 PVs with available space"
 msgstr ""

 #: ./doc/common/tables/cinder-lvm.xml25(td)
@ -30486,6 +30574,26 @@ msgid ""
 "volumes can be allocated to the volume destination."
 msgstr ""

+#: ./doc/common/tables/cinder-hds-hnas.xml7(caption)
+msgid "Description of configuration options for hds-hnas"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml21(td)
+msgid "hds_hnas_iscsi_config_file = /opt/hds/hnas/cinder_iscsi_conf.xml"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml22(td)
+msgid "(StrOpt) configuration file for HDS iSCSI cinder plugin"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml25(td)
+msgid "hds_hnas_nfs_config_file = /opt/hds/hnas/cinder_nfs_conf.xml"
+msgstr ""
+
+#: ./doc/common/tables/cinder-hds-hnas.xml26(td)
+msgid "(StrOpt) configuration file for HDS NFS cinder plugin"
+msgstr ""
+
 #: ./doc/common/tables/heat-api.xml25(td)
 msgid "heat_stack_user_role = heat_stack_user"
 msgstr ""
@ -30778,7 +30886,6 @@ msgid "(IntOpt) Minimum tunnel ID to use"
 msgstr ""

 #: ./doc/common/tables/glance-logging.xml90(td)
-#: ./doc/common/tables/cinder-common.xml218(td)
 #: ./doc/common/tables/keystone-logging.xml78(td)
 msgid ""
 "(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED "
@ -30896,6 +31003,10 @@ msgstr ""
 msgid "(BoolOpt) make exception message format errors fatal"
 msgstr ""

+#: ./doc/common/tables/cinder-common.xml57(td)
+msgid "host = localhost"
+msgstr ""
+
 #: ./doc/common/tables/cinder-common.xml58(td)
 msgid ""
 "(StrOpt) Name of this node. This can be an opaque identifier. It is not "
@ -32661,38 +32772,59 @@ msgid "(IntOpt) Port on which OpenStack Volume API listens"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml81(td)
-msgid "transfer_api_class = cinder.transfer.api.API"
+#: ./doc/common/tables/cinder-conf-changes-icehouse.xml144(td)
+msgid "osapi_volume_workers = None"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml82(td)
-msgid "(StrOpt) The full class name of the volume transfer API class"
+msgid ""
+"(IntOpt) Number of workers for OpenStack Volume API service. The default is "
+"equal to the number of CPUs available."
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml85(td)
-msgid "volume_api_class = cinder.volume.api.API"
+msgid "transfer_api_class = cinder.transfer.api.API"
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml86(td)
+msgid "(StrOpt) The full class name of the volume transfer API class"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml89(td)
-msgid "volume_name_template = volume-%s"
-msgstr ""
-
-#: ./doc/common/tables/cinder-api.xml90(td)
-msgid "(StrOpt) Template string to be used to generate volume names"
+msgid "volume_api_class = cinder.volume.api.API"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml93(td)
-msgid "volume_transfer_key_length = 16"
+msgid "volume_name_template = volume-%s"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml94(td)
-msgid "(IntOpt) The number of characters in the autogenerated auth key."
+msgid "(StrOpt) Template string to be used to generate volume names"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml97(td)
-msgid "volume_transfer_salt_length = 8"
+msgid "volume_number_multiplier = -1.0"
 msgstr ""

 #: ./doc/common/tables/cinder-api.xml98(td)
+msgid ""
+"(FloatOpt) Multiplier used for weighing volume number. Negative numbers mean"
+" to spread vs stack."
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml101(td)
+msgid "volume_transfer_key_length = 16"
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml102(td)
+msgid "(IntOpt) The number of characters in the autogenerated auth key."
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml105(td)
+msgid "volume_transfer_salt_length = 8"
+msgstr ""
+
+#: ./doc/common/tables/cinder-api.xml106(td)
 msgid "(IntOpt) The number of characters in the salt."
 msgstr ""

@ -36197,22 +36329,6 @@ msgstr ""
 msgid "(StrOpt) The configuration file for the Cinder HDS driver for HUS"
 msgstr ""

-#: ./doc/common/tables/cinder-hds-hus.xml25(td)
-msgid "hds_hnas_iscsi_config_file = /opt/hds/hnas/cinder_iscsi_conf.xml"
-msgstr ""
-
-#: ./doc/common/tables/cinder-hds-hus.xml26(td)
-msgid "(StrOpt) configuration file for HDS iSCSI cinder plugin"
-msgstr ""
-
-#: ./doc/common/tables/cinder-hds-hus.xml29(td)
-msgid "hds_hnas_nfs_config_file = /opt/hds/hnas/cinder_nfs_conf.xml"
-msgstr ""
-
-#: ./doc/common/tables/cinder-hds-hus.xml30(td)
-msgid "(StrOpt) configuration file for HDS NFS cinder plugin"
-msgstr ""
-
 #: ./doc/common/tables/cinder-netapp_7mode_iscsi.xml7(caption)
 msgid "Description of configuration options for netapp_7mode_iscsi"
 msgstr ""
@ -36922,6 +37038,10 @@ msgstr ""
 msgid "(IntOpt) Default Time Out For CLI operations in minutes"
 msgstr ""

+#: ./doc/common/tables/cinder-rpc.xml209(td)
+msgid "rpc_zmq_host = localhost"
+msgstr ""
+
 #: ./doc/common/tables/cinder-rpc.xml233(td)
 msgid "volume_topic = cinder-volume"
 msgstr ""
@ -39749,10 +39869,6 @@ msgstr ""
 msgid "(IntOpt) TCP Buffer size in KiloBytes."
 msgstr ""

-#: ./doc/common/tables/cinder-conf-changes-icehouse.xml144(td)
-msgid "osapi_volume_workers = None"
-msgstr ""
-
 #: ./doc/common/tables/cinder-conf-changes-icehouse.xml145(td)
 msgid "(IntOpt) Number of workers for OpenStack Volume API service"
 msgstr ""
@ -42903,100 +43019,12 @@ msgid ""
 "neutron.ml2.type_drivers namespace."
 msgstr ""

-#: ./doc/common/tables/keystone-database.xml22(td)
-msgid "(StrOpt) The back end to use for the database."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml26(td)
-msgid ""
-"(StrOpt) The SQLAlchemy connection string to use to connect to the database."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml30(td)
-msgid ""
-"(IntOpt) Verbosity of SQL debugging information: 0=None, 100=Everything."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml34(td)
-msgid "(BoolOpt) Add Python stack traces to SQL as comment strings."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml38(td)
-msgid ""
-"(BoolOpt) If True, increases the interval between database connection "
-"retries up to db_max_retry_interval."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml42(td)
-msgid ""
-"(IntOpt) Maximum database connection retries before error is raised. Set to "
-"-1 to specify an infinite retry count."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml46(td)
-msgid ""
-"(IntOpt) If db_inc_retry_interval is set, the maximum seconds between "
-"database connection retries."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml50(td)
-msgid "(IntOpt) Seconds between database connection retries."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml54(td)
-msgid "(IntOpt) Timeout before idle SQL connections are reaped."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml58(td)
-msgid "(IntOpt) If set, use this value for max_overflow with SQLAlchemy."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml62(td)
-msgid "(IntOpt) Maximum number of SQL connections to keep open in a pool."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml66(td)
-msgid ""
-"(IntOpt) Maximum db connection retries during startup. Set to -1 to specify "
-"an infinite retry count."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml70(td)
-msgid "(IntOpt) Minimum number of SQL connections to keep open in a pool."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml78(td)
-msgid "(IntOpt) If set, use this value for pool_timeout with SQLAlchemy."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml82(td)
-msgid "(IntOpt) Interval between retries of opening a SQL connection."
-msgstr ""
-
 #: ./doc/common/tables/keystone-database.xml86(td)
 msgid ""
 "(StrOpt) The SQLAlchemy connection string to use to connect to the slave "
 "database."
 msgstr ""

-#: ./doc/common/tables/keystone-database.xml89(td)
-msgid "sqlite_db = oslo.sqlite"
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml90(td)
-msgid "(StrOpt) The file name to use with SQLite."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml94(td)
-msgid "(BoolOpt) If True, SQLite uses synchronous mode."
-msgstr ""
-
-#: ./doc/common/tables/keystone-database.xml98(td)
-msgid ""
-"(BoolOpt) Enable the experimental use of database reconnect on connection "
-"lost."
-msgstr ""
-
 #: ./doc/common/tables/keystone-memcache.xml7(caption)
 msgid "Description of configuration options for memcache"
 msgstr ""
--- a/doc/glossary/locale/ja.po
+++ b/doc/glossary/locale/ja.po
--- a/doc/glossary/locale/ko_KR.po
+++ b/doc/glossary/locale/ko_KR.po
--- a/doc/image-guide/locale/image-guide.pot
+++ b/doc/image-guide/locale/image-guide.pot
@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-23 06:12+0000\n"
+"POT-Creation-Date: 2014-07-27 06:09+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"
@ -1246,7 +1246,7 @@ msgid "The <literal>-u</literal> tells Oz to do the customization (install extra
 msgstr ""

 #: ./doc/image-guide/ch_creating_images_automatically.xml:102(para)
-msgid "The <literal>-x &lt;filename&gt;</literal> flag tells Oz what filename to use to write out a libvirt XML file (otherwise it will default to something like <filename>centos64Apr_03_2013-12:39:42</filename>."
+msgid "The <literal>-x &lt;filename&gt;</literal> flag tells Oz what filename to use to write out a libvirt XML file (otherwise it will default to something like <filename>centos64Apr_03_2013-12:39:42</filename>)."
 msgstr ""

 #: ./doc/image-guide/ch_creating_images_automatically.xml:90(para)
--- a/doc/install-guide/locale/install-guide.pot
+++ b/doc/install-guide/locale/install-guide.pot
@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-25 06:09+0000\n"
+"POT-Creation-Date: 2014-07-27 06:09+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"
@ -2087,7 +2087,7 @@ msgstr ""
 msgid "Respond to prompts for <link linkend=\"debconf-dbconfig-common\">database management</link>, <link linkend=\"debconf-keystone_authtoken\">Identity service credentials</link>, <link linkend=\"debconf-api-endpoints\">service endpoint registration</link>, and <link linkend=\"debconf-rabbitmq\">message broker credentials</link>."
 msgstr ""

-#: ./doc/install-guide/section_nova-controller-install.xml:199(para) ./doc/install-guide/section_nova-networking-controller-node.xml:28(para) ./doc/install-guide/section_neutron-ml2-controller-node.xml:441(para) ./doc/install-guide/section_neutron-ovs-controller-node.xml:318(para)
+#: ./doc/install-guide/section_nova-controller-install.xml:199(para) ./doc/install-guide/section_nova-networking-controller-node.xml:29(para) ./doc/install-guide/section_neutron-ml2-controller-node.xml:441(para) ./doc/install-guide/section_neutron-ovs-controller-node.xml:318(para)
 msgid "Restart the Compute services:"
 msgstr ""

@ -2323,11 +2323,11 @@ msgstr ""
 msgid "To install legacy networking components"
 msgstr ""

-#: ./doc/install-guide/section_nova-networking-compute-node.xml:23(title) ./doc/install-guide/section_nova-networking-controller-node.xml:11(title)
+#: ./doc/install-guide/section_nova-networking-compute-node.xml:23(title) ./doc/install-guide/section_nova-networking-controller-node.xml:12(title)
 msgid "To configure legacy networking"
 msgstr ""

-#: ./doc/install-guide/section_nova-networking-compute-node.xml:25(para) ./doc/install-guide/section_neutron-ml2-compute-node.xml:184(para) ./doc/install-guide/section_neutron-ml2-compute-node.xml:276(para) ./doc/install-guide/section_nova-networking-controller-node.xml:13(para) ./doc/install-guide/section_neutron-ml2-controller-node.xml:315(para) ./doc/install-guide/section_neutron-ml2-controller-node.xml:359(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:186(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:220(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:257(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:351(para) ./doc/install-guide/section_ceilometer-glance.xml:21(para)
+#: ./doc/install-guide/section_nova-networking-compute-node.xml:25(para) ./doc/install-guide/section_neutron-ml2-compute-node.xml:184(para) ./doc/install-guide/section_neutron-ml2-compute-node.xml:276(para) ./doc/install-guide/section_nova-networking-controller-node.xml:14(para) ./doc/install-guide/section_neutron-ml2-controller-node.xml:315(para) ./doc/install-guide/section_neutron-ml2-controller-node.xml:359(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:186(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:220(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:257(para) ./doc/install-guide/section_neutron-ml2-network-node.xml:351(para) ./doc/install-guide/section_ceilometer-glance.xml:21(para)
 msgid "Run the following commands:"
 msgstr ""

@ -2335,7 +2335,7 @@ msgstr ""
 msgid "Replace <replaceable>INTERFACE_NAME</replaceable> with the actual interface name for the external network. For example, <emphasis>eth1</emphasis> or <emphasis>ens224</emphasis>."
 msgstr ""

-#: ./doc/install-guide/section_nova-networking-compute-node.xml:57(para) ./doc/install-guide/section_nova-networking-controller-node.xml:20(para)
+#: ./doc/install-guide/section_nova-networking-compute-node.xml:57(para) ./doc/install-guide/section_nova-networking-controller-node.xml:21(para)
 msgid "Edit the <filename>/etc/nova/nova.conf</filename> file and add the following keys to the <literal>[DEFAULT]</literal> section:"
 msgstr ""

@ -3275,7 +3275,7 @@ msgid "The packages do not require pre-depends. If <systemitem class=\"library\"
 msgstr ""

 #: ./doc/install-guide/section_nova-networking-controller-node.xml:8(para)
-msgid "Legacy networking primarily involves compute nodes. However, you must configure the controller node to use it."
+msgid "Legacy networking primarily involves compute nodes. However, you must configure the controller node to use legacy networking."
 msgstr ""

 #: ./doc/install-guide/ch_nova.xml:8(title)
--- a/doc/install-guide/locale/ja.po
+++ b/doc/install-guide/locale/ja.po
@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-07-25 00:50+0000\n"
-"PO-Revision-Date: 2014-07-25 00:48+0000\n"
+"POT-Creation-Date: 2014-07-27 05:14+0000\n"
+"PO-Revision-Date: 2014-07-25 16:19+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
@ -3614,7 +3614,7 @@ msgid ""
 msgstr "<link linkend=\"debconf-dbconfig-common\">データベース管理</link>、<link linkend=\"debconf-keystone_authtoken\">Identity のクレデンシャル</link>、<link linkend=\"debconf-api-endpoints\">サービスエンドポイント登録</link>、<link linkend=\"debconf-rabbitmq\">メッセージブローカーのクレデンシャル</link>に関するプロンプトに答えます。"

 #: ./doc/install-guide/section_nova-controller-install.xml199(para)
-#: ./doc/install-guide/section_nova-networking-controller-node.xml28(para)
+#: ./doc/install-guide/section_nova-networking-controller-node.xml29(para)
 #: ./doc/install-guide/section_neutron-ml2-controller-node.xml441(para)
 #: ./doc/install-guide/section_neutron-ovs-controller-node.xml318(para)
 msgid "Restart the Compute services:"
@ -3970,14 +3970,14 @@ msgid "To install legacy networking components"
 msgstr "レガシーネットワークのコンポーネントのインストール方法"

 #: ./doc/install-guide/section_nova-networking-compute-node.xml23(title)
-#: ./doc/install-guide/section_nova-networking-controller-node.xml11(title)
+#: ./doc/install-guide/section_nova-networking-controller-node.xml12(title)
 msgid "To configure legacy networking"
 msgstr "レガシーネットワークの設定方法"

 #: ./doc/install-guide/section_nova-networking-compute-node.xml25(para)
 #: ./doc/install-guide/section_neutron-ml2-compute-node.xml184(para)
 #: ./doc/install-guide/section_neutron-ml2-compute-node.xml276(para)
-#: ./doc/install-guide/section_nova-networking-controller-node.xml13(para)
+#: ./doc/install-guide/section_nova-networking-controller-node.xml14(para)
 #: ./doc/install-guide/section_neutron-ml2-controller-node.xml315(para)
 #: ./doc/install-guide/section_neutron-ml2-controller-node.xml359(para)
 #: ./doc/install-guide/section_neutron-ml2-network-node.xml186(para)
@ -3997,7 +3997,7 @@ msgid ""
 msgstr "<replaceable>INTERFACE_NAME</replaceable> を外部ネットワーク用の実際のインターフェース名で置き換えます。例えば、<emphasis>eth1</emphasis> や <emphasis>ens224</emphasis> です。"

 #: ./doc/install-guide/section_nova-networking-compute-node.xml57(para)
-#: ./doc/install-guide/section_nova-networking-controller-node.xml20(para)
+#: ./doc/install-guide/section_nova-networking-controller-node.xml21(para)
 msgid ""
 "Edit the <filename>/etc/nova/nova.conf</filename> file and add the following"
 " keys to the <literal>[DEFAULT]</literal> section:"
@ -5523,8 +5523,8 @@ msgstr "パッケージは事前の依存関係を必要としません。<syste
 #: ./doc/install-guide/section_nova-networking-controller-node.xml8(para)
 msgid ""
 "Legacy networking primarily involves compute nodes. However, you must "
-"configure the controller node to use it."
-msgstr "レガシーネットワークは、主にコンピュートノードを関係します。しかしながら、それを使用するために、コントローラーノードを設定する必要があります。"
+"configure the controller node to use legacy networking."
+msgstr ""

 #: ./doc/install-guide/ch_nova.xml8(title)
 msgid "Add the Compute service"
--- a/doc/user-guide-admin/locale/ja.po
+++ b/doc/user-guide-admin/locale/ja.po
@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-07-11 03:15+0000\n"
-"PO-Revision-Date: 2014-07-10 13:11+0000\n"
+"POT-Creation-Date: 2014-07-27 05:14+0000\n"
+"PO-Revision-Date: 2014-07-24 18:05+0000\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"
@ -2065,9 +2065,9 @@ msgid "Keyword arguments:"
 msgstr "キーワード引数:"

 #: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml53(para)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml67(para)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml78(para)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml89(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml61(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml72(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml83(para)
 msgid "Example:"
 msgstr "例:"

@ -2075,31 +2075,29 @@ msgstr "例:"
 msgid "service-list"
 msgstr "service-list"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml61(para)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml72(para)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml83(para)
-msgid "Arguments"
-msgstr "引数"
-
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml64(para)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml75(para)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml86(para)
-msgid "service_id"
-msgstr "service_id"
-
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml71(literal)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml65(literal)
 msgid "service-get"
 msgstr "service-get"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml82(literal)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml66(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml77(para)
+msgid "Arguments"
+msgstr "引数"
+
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml69(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml80(para)
+msgid "service_id"
+msgstr "service_id"
+
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml76(literal)
 msgid "service-delete"
 msgstr "service-delete"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml93(title)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml87(title)
 msgid "Create a tenant (project)"
 msgstr "テナント (プロジェクト) の作成"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml94(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml88(para)
 msgid ""
 "A tenant is a group of zero or more users. In nova, a tenant owns virtual "
 "machines. In swift, a tenant owns containers. In the Dashboard, tenants are "
@ -2107,83 +2105,83 @@ msgid ""
 "Each tenant and user pairing can have a role associated with it."
 msgstr "テナントは、0 以上のユーザーのグループです。nova では、テナントが仮想マシンを所有します。swift では、テナントがコンテナーを所有します。Dashboard では、テナントがプロジェクトとして表現されます。ユーザーは複数のテナントに関連づけられます。各テナントとユーザーの組み合わせは、それと関連づけられたロールを持てます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml102(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml96(para)
 msgid ""
 "To list all projects with their ID, name, and whether they are enabled or "
 "disabled:"
 msgstr "すべてのプロジェクト、ID、名前、有効化の状態を一覧表示する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml118(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml112(para)
 msgid "Create a project named <literal>new-project</literal>:"
 msgstr "<literal>new-project</literal> という名前のプロジェクトを作成します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml121(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml115(para)
 msgid "By default, the project is enabled."
 msgstr "プロジェクトはデフォルトで有効化されます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml130(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml124(para)
 msgid ""
 "Note the ID for the project so you can update it in the next procedure."
 msgstr "次の手順で更新できるよう、プロジェクトの ID を記録します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml136(title)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml130(title)
 #: ./doc/user-guide-admin/section_dashboard_admin_manage_projects_users.xml81(title)
 msgid "Update a project"
 msgstr "プロジェクトの更新"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml137(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml131(para)
 msgid ""
 "Specify the project ID to update a project. You can update the name, "
 "description, and enabled status of a project."
 msgstr "プロジェクトを更新するために、プロジェクトを指定します。プロジェクトの名前、説明、有効化状態を更新できます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml142(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml136(para)
 msgid "To temporarily disable a project:"
 msgstr "プロジェクトを一時的に無効化する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml143(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml147(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml151(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml156(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml173(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml137(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml141(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml145(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml150(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml167(replaceable)
 msgid "PROJECT_ID"
 msgstr "PROJECT_ID"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml146(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml140(para)
 msgid "To enable a disabled project:"
 msgstr "無効化したプロジェクトを有効化する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml150(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml144(para)
 msgid "To update the name of a project:"
 msgstr "プロジェクトの名前を更新する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml154(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml148(para)
 msgid "To verify your changes, show information for the updated project:"
 msgstr "変更内容を確認するために、更新したプロジェクトの情報を表示します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml169(title)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml163(title)
 msgid "Delete a project"
 msgstr "プロジェクトの削除"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml172(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml166(para)
 msgid "To delete a project:"
 msgstr "プロジェクトの削除方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml178(title)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml172(title)
 msgid "Create a user"
 msgstr "ユーザーの作成"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml181(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml175(para)
 msgid "To list all users:"
 msgstr "すべてのユーザーの一覧表示方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml183(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml177(para)
 msgid ""
 "The output shows the ID, name, enabled status, and e-mail address for each "
 "user:"
 msgstr "各ユーザーの ID、名前、有効化状態、電子メールアドレスが表示されます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml196(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml190(para)
 msgid ""
 "To create a user, you must specify a name. Optionally, you can specify a "
 "tenant ID, password, and email address. It is recommended that you include "
@ -2191,146 +2189,146 @@ msgid ""
 "without this information."
 msgstr "ユーザーを作成するために、名前を指定する必要があります。オプションとして、プロジェクト ID、パスワード、電子メールアドレスを指定できます。プロジェクト ID とパスワードがなければ、ユーザーがダッシュボードにログインできないため、それらを含めることを推奨します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml202(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml196(para)
 msgid "To create the <literal>new-user</literal> user:"
 msgstr "<literal>new-user</literal> ユーザーを作成する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml204(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml198(replaceable)
 msgid "PASSWORD"
 msgstr "PASSWORD"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml218(title)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml212(title)
 msgid "Update a user"
 msgstr "ユーザーの更新"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml219(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml213(para)
 msgid "You can update the name, email address, and enabled status for a user."
 msgstr "ユーザーの名前、電子メールアドレス、有効化状態を更新できます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml223(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml217(para)
 msgid "To temporarily disable a user account:"
 msgstr "ユーザーアカウントを一時的に無効化する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml225(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml233(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml238(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml248(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml347(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml351(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml371(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml376(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml219(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml227(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml232(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml242(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml341(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml345(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml365(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml370(replaceable)
 msgid "USER_ID"
 msgstr "USER_ID"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml226(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml220(para)
 msgid ""
 "If you disable a user account, the user cannot log in to the dashboard. "
 "However, data for the user account is maintained, so you can enable the user"
 " at any time."
 msgstr "ユーザーアカウントを無効化した場合、そのユーザーはダッシュボードにログインできません。しかしながら、ユーザーアカウントのデータは保持されるので、いつでも有効化できます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml232(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml226(para)
 msgid "To enable a disabled user account:"
 msgstr "無効化したユーザーアカウントを有効化する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml236(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml230(para)
 msgid "To change the name and description for a user account:"
 msgstr "ユーザーアカウントの名前や説明を変更する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml244(title)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml238(title)
 msgid "Delete a user"
 msgstr "ユーザーの削除"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml247(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml241(para)
 msgid "To delete a specified user account:"
 msgstr "指定したユーザーアカウントを削除する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml253(title)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml247(title)
 msgid "Create and assign a role"
 msgstr "ロールの作成と割り当て"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml254(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml248(para)
 msgid ""
 "Users can be members of multiple projects. To assign users to multiple "
 "projects, define a role and assign that role to a user-project pair."
 msgstr "ユーザーは複数のプロジェクトのメンバーになれます。ユーザーを複数のプロジェクトに割り当てるために、ロールを定義し、そのロールをユーザーとプロジェクトの組に割り当ます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml259(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml253(para)
 msgid "To list the available roles:"
 msgstr "利用可能なロールを一覧表示する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml272(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml266(para)
 msgid "To create the <literal>new-role</literal> role:"
 msgstr "<literal>new-role</literal> ロールを作成する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml283(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml277(para)
 msgid ""
 "To assign a user to a project, you must assign the role to a user-project "
 "pair. To do this, you need the user, role, and project IDs."
 msgstr "ユーザーをプロジェクトに割り当てるために、ロールをユーザーとプロジェクトの組に割り当てる必要があります。そうするために、ユーザー、ロール、プロジェクトの ID が必要となります。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml289(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml283(para)
 msgid "To list users:"
 msgstr "ユーザーを一覧表示する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml301(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml295(para)
 msgid "Note the ID of the user to which you want to assign the role."
 msgstr "ロールに割り当てたいユーザーの ID を記録します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml305(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml299(para)
 msgid "To list role IDs:"
 msgstr "ロール ID を一覧表示する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml317(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml311(para)
 msgid "Note the ID of the role that you want to assign."
 msgstr "割り当てたいロールの ID を記録します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml321(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml315(para)
 msgid "To list projects:"
 msgstr "プロジェクトを一覧表示する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml335(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml329(para)
 msgid "Note the ID of the project to which you want to assign the role."
 msgstr "ロールを割り当てたいプロジェクトの ID を記録します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml341(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml335(para)
 msgid ""
 "Assign a role to a user-project pair. In this example, you assign the "
 "<literal>new-role</literal> role to the <literal>demo</literal> and <literal"
 ">test-project</literal> pair:"
 msgstr "ユーザーとプロジェクトの組み合わせにロールを割り当てます。この例では、<literal>demo</literal> / <literal>test-project</literal> に <literal>new-role</literal> ロールを割り当てます。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml347(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml360(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml371(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml341(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml354(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml365(replaceable)
 msgid "ROLE_ID"
 msgstr "ROLE_ID"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml347(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml351(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml371(replaceable)
-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml376(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml341(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml345(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml365(replaceable)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml370(replaceable)
 #: ./doc/user-guide-admin/section_cli_nova_manage_flavors.xml212(replaceable)
 msgid "TENANT_ID"
 msgstr "TENANT_ID"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml350(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml344(para)
 msgid "To verify the role assignment:"
 msgstr "ロールの割り当てを確認する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml359(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml353(para)
 msgid "To get details for a specified role:"
 msgstr "指定したロールの詳細を取得する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml369(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml363(para)
 msgid "To remove a role from a user-project pair:"
 msgstr "ユーザーとプロジェクトの組からロールを削除する方法:"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml374(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml368(para)
 msgid "To verify the role removal, run the following command:"
 msgstr "ロールの削除を確認するために、以下のコマンドを実行します。"

-#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml377(para)
+#: ./doc/user-guide-admin/section_cli_keystone_manage_projects_users_roles.xml371(para)
 msgid "If the role was removed, the command output omits the removed role."
 msgstr "ロールが削除されると、コマンドの出力から削除されたロールが消えています。"

--- a/doc/user-guide-admin/locale/user-guide-admin.pot
+++ b/doc/user-guide-admin/locale/user-guide-admin.pot