Imported Translations from Zanata

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

Change-Id: Ibc5ad69983686618e043d21b3fbf63d7554adecc

doc/arch-design/locale/arch-design.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-18 06:19+0000\n"
+"POT-Creation-Date: 2015-09-26 06:15+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"
@@ -5416,7 +5416,7 @@ msgid "One of the benefits of OpenStack Object Storage is the ability to mix and
 msgstr ""
 
 #: ./doc/arch-design/generalpurpose/section_tech_considerations_general_purpose.xml:207(para)
-msgid "To achieve durability and availability of data stored as objects it is important to design object storage resource pools to ensure they can provide the suggested availability. Considering rack-level and zone-level designs to accommodate the number of replicas configured to be stored in the Object Storage service (the defult number of replicas is three) is important when designing beyond the hardware node level. Each replica of data should exist in its own availability zone with its own power, cooling, and network resources available to service that specific zone."
+msgid "To achieve durability and availability of data stored as objects it is important to design object storage resource pools to ensure they can provide the suggested availability. Considering rack-level and zone-level designs to accommodate the number of replicas configured to be stored in the Object Storage service (the default number of replicas is three) is important when designing beyond the hardware node level. Each replica of data should exist in its own availability zone with its own power, cooling, and network resources available to service that specific zone."
 msgstr ""
 
 #: ./doc/arch-design/generalpurpose/section_tech_considerations_general_purpose.xml:216(para)

doc/arch-design/locale/zh_CN.po

@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-18 21:47+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4433,21 +4433,6 @@ msgstr "上线时间"
 msgid "Time-to-market"
 msgstr "上线时间"
 
-msgid ""
-"To achieve durability and availability of data stored as objects it is "
-"important to design object storage resource pools to ensure they can provide "
-"the suggested availability. Considering rack-level and zone-level designs to "
-"accommodate the number of replicas configured to be stored in the Object "
-"Storage service (the defult number of replicas is three) is important when "
-"designing beyond the hardware node level. Each replica of data should exist "
-"in its own availability zone with its own power, cooling, and network "
-"resources available to service that specific zone."
-msgstr ""
-"为了实现数据存储和对象一样的持久和可用，设计对象存储资源池显得非常的重要，在"
-"硬件节点这层之外的设计，考虑机柜层或区域层是非常重要的，在对象存储服务中配置"
-"数据复制多少份保存(默认情况是3份)。每份复制的数据最好独立的可用区域中，有独立"
-"的电源、冷却设备以及网络资源。"
-
 msgid ""
 "To effectively run cloud installations, initial downtime planning includes "
 "creating processes and architectures that support the following:"

doc/common-rst/source/locale/common-rst.pot

@@ -46,7 +46,7 @@ msgid "**Empty log output for Linux instances**"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:143 ../common/log_in_dashboard.rst:146
-#: ../common/log_in_dashboard.rst:142
+#: ../common/log_in_dashboard.rst:142 ../common/log_in_dashboard.rst:141
 msgid "**Figure: Admin tab**"
 msgstr ""
 
@@ -184,19 +184,20 @@ msgid ":guilabel:`Admin` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:203 ../common/log_in_dashboard.rst:195
-#: ../common/log_in_dashboard.rst:201
+#: ../common/log_in_dashboard.rst:201 ../common/log_in_dashboard.rst:200
 msgid ""
 ":guilabel:`Block Storage Services`: View a list of all Block Storage "
 "services."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:219 ../common/log_in_dashboard.rst:225
+#: ../common/log_in_dashboard.rst:224
 msgid ":guilabel:`Change Password`: Change the password of the user."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:191 ../common/log_in_dashboard.rst:194
 #: ../common/log_in_dashboard.rst:201 ../common/log_in_dashboard.rst:193
-#: ../common/log_in_dashboard.rst:199
+#: ../common/log_in_dashboard.rst:199 ../common/log_in_dashboard.rst:198
 msgid ":guilabel:`Compute Services`: View a list of all Compute services."
 msgstr ""
 
@@ -220,7 +221,7 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:189 ../common/log_in_dashboard.rst:181
-#: ../common/log_in_dashboard.rst:187
+#: ../common/log_in_dashboard.rst:187 ../common/log_in_dashboard.rst:186
 msgid ""
 ":guilabel:`Defaults`: View default quota values. Quotas are hard-coded in "
 "OpenStack Compute and define the maximum allowable size and number of "
@@ -241,14 +242,14 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:167 ../common/log_in_dashboard.rst:170
-#: ../common/log_in_dashboard.rst:162
+#: ../common/log_in_dashboard.rst:162 ../common/log_in_dashboard.rst:161
 msgid ""
 ":guilabel:`Host Aggregates`: View, create, and edit host aggregates. View "
 "the list of availability zones."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:165 ../common/log_in_dashboard.rst:168
-#: ../common/log_in_dashboard.rst:160
+#: ../common/log_in_dashboard.rst:160 ../common/log_in_dashboard.rst:159
 msgid ":guilabel:`Hypervisors`: View the hypervisor summary."
 msgstr ""
 
@@ -278,7 +279,7 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:170 ../common/log_in_dashboard.rst:173
-#: ../common/log_in_dashboard.rst:165
+#: ../common/log_in_dashboard.rst:165 ../common/log_in_dashboard.rst:164
 msgid ""
 ":guilabel:`Instances`: View, pause, resume, suspend, migrate, soft or hard "
 "reboot, and delete running instances that belong to users of some, but not "
@@ -292,7 +293,7 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:193 ../common/log_in_dashboard.rst:185
-#: ../common/log_in_dashboard.rst:191
+#: ../common/log_in_dashboard.rst:191 ../common/log_in_dashboard.rst:190
 msgid ""
 ":guilabel:`Metadata Definitions`: Import namespace and view the metadata "
 "information."
@@ -300,7 +301,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:193 ../common/log_in_dashboard.rst:196
 #: ../common/log_in_dashboard.rst:206 ../common/log_in_dashboard.rst:198
-#: ../common/log_in_dashboard.rst:204
+#: ../common/log_in_dashboard.rst:204 ../common/log_in_dashboard.rst:203
 msgid ":guilabel:`Network Agents`: View the network agents."
 msgstr ""
 
@@ -327,7 +328,7 @@ msgid ":guilabel:`Object Store` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:208 ../common/log_in_dashboard.rst:200
-#: ../common/log_in_dashboard.rst:206
+#: ../common/log_in_dashboard.rst:206 ../common/log_in_dashboard.rst:205
 msgid ""
 ":guilabel:`Orchestration Services`: View a list of all Orchestration "
 "services."
@@ -338,7 +339,7 @@ msgid ":guilabel:`Orchestration` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:156 ../common/log_in_dashboard.rst:159
-#: ../common/log_in_dashboard.rst:151
+#: ../common/log_in_dashboard.rst:151 ../common/log_in_dashboard.rst:150
 msgid ":guilabel:`Overview`: View basic reports."
 msgstr ""
 
@@ -352,6 +353,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:203 ../common/log_in_dashboard.rst:206
 #: ../common/log_in_dashboard.rst:215 ../common/log_in_dashboard.rst:212
+#: ../common/log_in_dashboard.rst:211
 msgid ""
 ":guilabel:`Projects`: View, create, assign users to, remove users from, and "
 "delete projects."
@@ -364,7 +366,7 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:158 ../common/log_in_dashboard.rst:161
-#: ../common/log_in_dashboard.rst:153
+#: ../common/log_in_dashboard.rst:153 ../common/log_in_dashboard.rst:152
 msgid ""
 ":guilabel:`Resource Usage`: Use the following tabs to view the following "
 "usages:"
@@ -392,7 +394,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:189 ../common/log_in_dashboard.rst:192
 #: ../common/log_in_dashboard.rst:199 ../common/log_in_dashboard.rst:191
-#: ../common/log_in_dashboard.rst:197
+#: ../common/log_in_dashboard.rst:197 ../common/log_in_dashboard.rst:196
 msgid ":guilabel:`Services`: View a list of the services."
 msgstr ""
 
@@ -403,7 +405,7 @@ msgid ""
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:163 ../common/log_in_dashboard.rst:166
-#: ../common/log_in_dashboard.rst:158
+#: ../common/log_in_dashboard.rst:158 ../common/log_in_dashboard.rst:157
 msgid ":guilabel:`Stats`: View the statistics of all resources."
 msgstr ""
 
@@ -415,6 +417,7 @@ msgstr ""
 
 #: ../common/log_in_dashboard.rst:189 ../common/log_in_dashboard.rst:196
 #: ../common/log_in_dashboard.rst:188 ../common/log_in_dashboard.rst:194
+#: ../common/log_in_dashboard.rst:193
 msgid ""
 ":guilabel:`System Information`: Use the following tabs to view the service "
 "information:"
@@ -425,20 +428,23 @@ msgstr ""
 msgid ":guilabel:`System Panel` tab"
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:149
+#: ../common/log_in_dashboard.rst:149 ../common/log_in_dashboard.rst:148
 msgid ":guilabel:`System` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:164 ../common/log_in_dashboard.rst:156
+#: ../common/log_in_dashboard.rst:155
 msgid ":guilabel:`Usage Report`: View the usage report."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:217 ../common/log_in_dashboard.rst:223
+#: ../common/log_in_dashboard.rst:222
 msgid ":guilabel:`User Settings`: View and manage dashboard settings."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:206 ../common/log_in_dashboard.rst:209
 #: ../common/log_in_dashboard.rst:218 ../common/log_in_dashboard.rst:215
+#: ../common/log_in_dashboard.rst:214
 msgid ":guilabel:`Users`: View, create, enable, disable, and delete users."
 msgstr ""
 
@@ -448,18 +454,18 @@ msgid ""
 "snapshots."
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:175
+#: ../common/log_in_dashboard.rst:175 ../common/log_in_dashboard.rst:174
 msgid ""
 ":guilabel:`Volume Snapshots`: View, manage, and delete volume snapshots."
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:173
+#: ../common/log_in_dashboard.rst:173 ../common/log_in_dashboard.rst:172
 msgid ""
 ":guilabel:`Volume Types`: View, create, manage, and delete volume types."
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:85 ../common/log_in_dashboard.rst:81
-#: ../common/log_in_dashboard.rst:169
+#: ../common/log_in_dashboard.rst:169 ../common/log_in_dashboard.rst:168
 msgid ":guilabel:`Volumes`: Use the following tabs to complete these tasks:"
 msgstr ""
 
@@ -473,7 +479,7 @@ msgstr ""
 msgid ":guilabel:`Volumes`: View, create, edit, and delete volumes."
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:171
+#: ../common/log_in_dashboard.rst:171 ../common/log_in_dashboard.rst:170
 msgid ":guilabel:`Volumes`: View, create, manage, and delete volumes."
 msgstr ""
 
@@ -1928,6 +1934,12 @@ msgid ""
 "quotas."
 msgstr ""
 
+#: ../common/log_in_dashboard.rst:135
+msgid ""
+"Administrative users can use the :guilabel:`Admin` tab to view usage and to "
+"manage instances, volumes, flavors, images, services, and quotas."
+msgstr ""
+
 #: ../common/get_started_storage_concepts.rst:27
 #: ../common/get_started_storage_concepts.rst:30
 #: ../common/get_started_storage_concepts.rst:29
@@ -3198,6 +3210,7 @@ msgid "Cisco neutron plug-in"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:214 ../common/log_in_dashboard.rst:220
+#: ../common/log_in_dashboard.rst:219
 msgid ""
 "Click the 'Settings' button from the user drop down menu in the top right of "
 "any page, you will see the :guilabel:`Settings` tab."
@@ -4461,7 +4474,7 @@ msgid ""
 "Admin API endpoints, which should not be accessible by customers."
 msgstr ""
 
-#: ../common/log_in_dashboard.rst:144
+#: ../common/log_in_dashboard.rst:144 ../common/log_in_dashboard.rst:143
 msgid ""
 "From the :guilabel:`Admin` tab, you can access the following category to "
 "complete these tasks:"
@@ -6250,6 +6263,7 @@ msgid "OpenStack dashboard—:guilabel:`Admin` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:204 ../common/log_in_dashboard.rst:210
+#: ../common/log_in_dashboard.rst:209
 msgid "OpenStack dashboard—:guilabel:`Identity` tab"
 msgstr ""
 
@@ -6258,6 +6272,7 @@ msgid "OpenStack dashboard—:guilabel:`Project` tab"
 msgstr ""
 
 #: ../common/log_in_dashboard.rst:212 ../common/log_in_dashboard.rst:218
+#: ../common/log_in_dashboard.rst:217
 msgid "OpenStack dashboard—:guilabel:`Settings` tab"
 msgstr ""
 

doc/common/locale/fr.po

@@ -1,4 +1,3 @@
-#
 # Translators:
 # Alexis Monville <alexis.monville@ayeba.fr>, 2013
 # Alexis Monville <alexis.monville@ayeba.fr>, 2013
@@ -18,19 +17,23 @@
 # EVEILLARD <stephane.eveillard@gmail.com>, 2013
 # Kamel_CW <yamani.kamel@gmail.com>, 2014
 # RIBOT GENEVIEVE <genevieve.ribot@gmail.com>, 2013
+#
+#
+# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenStack Manuals\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-04 03:18+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
-"PO-Revision-Date: 2015-09-03 19:09+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: French (http://www.transifex.com/openstack/openstack-manuals-"
-"i18n/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-03 07:09+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: French (http://www.transifex.com/openstack/openstack-manuals-"
+"i18n/language/fr/)\n"
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Zanata 3.7.1\n"
 
 msgid "&lt;availability_zone&gt;"
 msgstr "&lt;availability_zone&gt;"
@@ -390,8 +393,7 @@ msgstr ""
 "literal> seront interprétées par <package>cloud-init</package> en tant que "
 "format de configuration de cloud."
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.png'; "
@@ -400,8 +402,7 @@ msgstr ""
 "@@image: '../common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.png'; "
 "md5=182dc38019a220c851e1c94aa50f4565"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: 'figures/horizon-screenshot.jpg'; "

doc/common/locale/ja.po

@@ -1,22 +1,25 @@
-#
 # Translators:
 # Akihiro Motoki <amotoki@gmail.com>, 2013
 # Andreas Jaeger <jaegerandi@gmail.com>, 2014
 # Tomoyuki KATO <tomo@dream.daynight.jp>, 2012-2014
 # Toru Makabe <t.makabe@gmail.com>, 2013-2014
+#
+#
+# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenStack Manuals\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-05 21:58+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
-"PO-Revision-Date: 2015-09-06 00:40+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Japanese (http://www.transifex.com/openstack/openstack-"
-"manuals-i18n/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-09-06 12:40+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: Japanese (http://www.transifex.com/openstack/openstack-"
+"manuals-i18n/language/ja/)\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.7.1\n"
 
 msgid "&lt;host&gt;"
 msgstr "&lt;host&gt;"
@@ -345,8 +348,7 @@ msgstr "<placeholder-1/> パッケージ"
 msgid "<placeholder-1/> prompt"
 msgstr "<placeholder-1/> プロンプト"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.png'; "
@@ -355,8 +357,7 @@ msgstr ""
 "@@image: '../common/figures/novnc/SCH_5009_V00_NUAC-VNC_OpenStack.png'; "
 "md5=182dc38019a220c851e1c94aa50f4565"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-accountscontainers.png'; "
@@ -365,8 +366,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-accountscontainers.png'; "
 "md5=4b15e5a202db5bde53c9b369058aeab8"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-arch.png'; "
@@ -375,8 +375,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-arch.png'; "
 "md5=90f6c7cf3947d7987eeb55d657cdc927"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-buildingblocks.png'; "
@@ -385,8 +384,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-buildingblocks.png'; "
 "md5=ed79466c8464513dbeaf1e0954280e5e"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-nodes.png'; "
@@ -395,8 +393,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-nodes.png'; "
 "md5=2aa7eb3bddcf6826f33469920dc2a9c3"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-partitions.png'; "
@@ -405,8 +402,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-partitions.png'; "
 "md5=2c161c2e92d6fefc8140ec86e79e9492"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-replication.png'; "
@@ -415,8 +411,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-replication.png'; "
 "md5=9d55594d7f445764569ab04d8d4373b2"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-ring.png'; "
@@ -425,8 +420,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-ring.png'; "
 "md5=a94e26734cec6980c3684d9e824eac2d"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-usecase.png'; "
@@ -435,8 +429,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-usecase.png'; "
 "md5=07480e7175b383171173775fb96d70d7"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage-zones.png'; "
@@ -445,8 +438,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage-zones.png'; "
 "md5=1b1dc0abe6ea0c516f22ce399deb75ed"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: '../common/figures/objectstorage.png'; "
@@ -455,8 +447,7 @@ msgstr ""
 "@@image: '../common/figures/objectstorage.png'; "
 "md5=e26e374ace84070f5fed24e73adcd562"
 
-#. When image changes, this message will be marked fuzzy or untranslated for
+#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. you.
 #. It doesn't matter what you translate it to: it's not used at all.
 msgid ""
 "@@image: 'figures/horizon-screenshot.jpg'; "
@@ -1128,16 +1119,6 @@ msgstr "Mac OS X または Linux の場合:"
 msgid "For Microsoft Windows:"
 msgstr "Microsoft Windows の場合:"
 
-msgid ""
-"For SUSE Linux Enterprise Server, use <package>zypper</package> to install "
-"the clients from the distribution packages in the Open Build Service. First, "
-"add the Open Build Service repository: <placeholder-1/> Then you can install "
-"the packages: <placeholder-2/>"
-msgstr ""
-"SUSE Linux Enterprise Server の場合、Open Build Service にあるディストリ"
-"ビューションのパッケージからクライアントをインストールするために "
-"<package>zypper</package> を使用します。"
-
 msgid ""
 "For example, copy the file to the computer from which you want to upload an "
 "image with a <placeholder-1/> client command."
@@ -1155,14 +1136,6 @@ msgstr ""
 msgid "For example:"
 msgstr "例:"
 
-msgid ""
-"For openSUSE, use <package>zypper</package> to install the clients from the "
-"distribution packages Service: <placeholder-1/>"
-msgstr ""
-"openSUSE の場合、ディストリビューションのパッケージサービスからクライアントを"
-"インストールするために <package>zypper</package> を使用します。"
-"<placeholder-1/>"
-
 msgid ""
 "For snapshots that you create from an instance that was booted from a volume:"
 msgstr "ボリュームから起動したインスタンスからスナップショットを作成する場合:"
@@ -2072,13 +2045,6 @@ msgstr ""
 msgid "RAID not required"
 msgstr "RAID 不要"
 
-msgid ""
-"RDO, openSUSE and SUSE Linux Enterprise have client packages that can be "
-"installed without <filename>pip</filename>."
-msgstr ""
-"RDO、openSUSE、SUSE Linux Enterprise は、<filename>pip</filename> を使用せず"
-"にインストールできるクライアントパッケージがあります。"
-
 msgid "REST API"
 msgstr "REST API"
 

doc/glossary/locale/de.po

@@ -1,23 +1,26 @@
-#
 # Translators:
 # Andreas Jaeger <jaegerandi@gmail.com>, 2014
 # Carsten Duch <cad@teuto.net>, 2014-2015
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
 # Frank Kloeker <eumel@arcor.de>, 2014
 # Reik Keutterling <spielkind@gmail.com>, 2015
+#
+#
+# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenStack Manuals\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-15 00:11+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
-"PO-Revision-Date: 2015-09-14 10:28+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: German (http://www.transifex.com/openstack/openstack-manuals-"
-"i18n/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-08-10 12:04+0000\n"
+"Last-Translator: Reik Keutterling <spielkind@gmail.com>\n"
+"Language-Team: German (http://www.transifex.com/openstack/openstack-manuals-"
+"i18n/language/de/)\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.7.1\n"
 
 msgid "A"
 msgstr "A"
@@ -319,9 +322,6 @@ msgstr "Graphics Processing Unit (GPU)"
 msgid "Grizzly"
 msgstr "Grizzly"
 
-msgid "Group"
-msgstr "Gruppe"
-
 msgid "HTTP"
 msgstr "HTTP"
 

doc/glossary/locale/en_GB.po

@@ -1,19 +1,22 @@
-#
 # Translators:
 # Isabell Long <isabell@issyl0.co.uk>, 2015
+#
+#
+# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenStack Manuals\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-15 00:11+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
-"PO-Revision-Date: 2015-09-14 10:28+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/"
-"openstack-manuals-i18n/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
+"PO-Revision-Date: 2015-08-12 08:22+0000\n"
+"Last-Translator: Isabell Long <isabell@issyl0.co.uk>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/openstack/"
+"openstack-manuals-i18n/language/en_GB/)\n"
+"Language: en-GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.7.1\n"
 
 msgid "6to4"
 msgstr "6to4"
@@ -354,9 +357,6 @@ msgstr "Custom modules that extend some OpenStack core APIs."
 msgid "Glossary"
 msgstr "Glossary"
 
-msgid "Group"
-msgstr "Group"
-
 msgid "HTTP"
 msgstr "HTTP"
 

doc/glossary/locale/ko_KR.po

@@ -1,4 +1,3 @@
-#
 # Translators:
 # HyunWoo Jo <showaid@gmail.com>, 2014
 # Ian Y. Choi <ianyrchoi@gmail.com>, 2014
@@ -6,19 +5,24 @@
 # Sungjin Kang <potopro@gmail.com>, 2013
 # Sungjin Kang <potopro@gmail.com>, 2014-2015
 # Ying Chun Guo <daisy.ycguo@gmail.com>, 2015
+#
+#
+# Ian Y. Choi <ianyrchoi@gmail.com>, 2015. #zanata
+# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenStack Manuals\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-15 00:11+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
-"PO-Revision-Date: 2015-09-14 10:28+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Korean (Korea) (http://www.transifex.com/openstack/openstack-"
-"manuals-i18n/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko_KR\n"
+"PO-Revision-Date: 2015-09-10 12:55+0000\n"
+"Last-Translator: Ian Y. Choi <ianyrchoi@gmail.com>\n"
+"Language-Team: Korean (Korea) (http://www.transifex.com/openstack/openstack-"
+"manuals-i18n/language/ko_KR/)\n"
+"Language: ko-KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.7.1\n"
 
 msgid "6to4"
 msgstr "6to4"
@@ -135,9 +139,9 @@ msgid ""
 "containers, and accounts. Auditors is the collective term for the Object "
 "Storage account auditor, container auditor, and object auditor."
 msgstr ""
-"오프젝트 스토리지 오브젝트, 컨테이너, 계정의 무결성을 검사하는 프로세스입니"
+"오브젝트 스토리지 상의 오브젝트, 컨테이너, 계정의 무결성을 검사하는 프로세스"
-"다. Auditors 는 오브젝트 스토리지 계정 auditor, 컨테이너 auditor, 오브젝트 "
+"입니다. Auditors 는 오브젝트 스토리지 계정 auditor, 컨테이너 auditor, 오브젝"
-"auditor에 대한 전체를 다 말합니다."
+"트 auditor에 대한 전체를 다 말합니다."
 
 msgid "ACL"
 msgstr "ACL"
@@ -527,9 +531,6 @@ msgstr "그래픽 처리 장치 (GPU)"
 msgid "Grizzly"
 msgstr "Grizzly"
 
-msgid "Group"
-msgstr "그룹"
-
 msgid "H"
 msgstr "H"
 

doc/glossary/locale/ru.po

@@ -1,23 +1,26 @@
-#
 # Translators:
 # Ainur Shakirov <ainur.shakirov.tt@gmail.com>, 2014
 # Aleksey Rusetskiy <fenuks@fenuks.ru>, 2015
 # Ilya Alekseyev <ilyaalekseyev@acm.org>, 2015
+#
+#
+# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenStack Manuals\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-15 00:11+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
-"PO-Revision-Date: 2015-09-14 10:28+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Russian (http://www.transifex.com/openstack/openstack-manuals-"
-"i18n/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-08-16 05:48+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: Russian (http://www.transifex.com/openstack/openstack-manuals-"
+"i18n/language/ru/)\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
+"X-Generator: Zanata 3.7.1\n"
 
 msgid "A Debian-based Linux distribution."
 msgstr "Основанный на Debian дистрибутив."
@@ -198,9 +201,6 @@ msgstr "GlusterFS"
 msgid "Grizzly"
 msgstr "Grizzly"
 
-msgid "Group"
-msgstr "Группа"
-
 msgid "HTTP"
 msgstr "HTTP"
 

doc/glossary/locale/zh_CN.po

@@ -1,19 +1,22 @@
-#
 # Translators:
 # johnwoo_lee <lijiangsheng1@gmail.com>, 2015
+#
+#
+# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenStack Manuals\n"
+"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-15 00:11+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
-"PO-Revision-Date: 2015-09-14 13:36+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/openstack/openstack-"
-"manuals-i18n/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2015-08-17 03:47+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/openstack/openstack-"
+"manuals-i18n/language/zh_CN/)\n"
+"Language: zh-CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Zanata 3.7.1\n"
 
 msgid "6to4"
 msgstr "6to4"
@@ -342,9 +345,6 @@ msgstr "DNS"
 msgid "Data processing service"
 msgstr "数据处理服务"
 
-msgid "Database service"
-msgstr "数据库服务"
-
 msgid ""
 "Denial of service (DoS) is a short form for denial-of-service attack. This "
 "is a malicious attempt to prevent legitimate users from using a service."
@@ -390,9 +390,6 @@ msgstr "GlusterFS"
 msgid "Grizzly"
 msgstr "Grizzly"
 
-msgid "Group"
-msgstr "组"
-
 msgid "H"
 msgstr "H"
 
@@ -464,9 +461,6 @@ msgstr "Identity"
 msgid "Identity service"
 msgstr "认证服务"
 
-msgid "Image service"
-msgstr "镜像服务"
-
 msgid ""
 "Impassable limits for guest VMs. Settings include total RAM size, maximum "
 "number of vCPUs, and maximum disk size."

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

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 14:46+0000\n"
+"POT-Creation-Date: 2015-09-26 06:16+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"
@@ -39,8 +39,8 @@ msgstr ""
 #: ../neutron-controller-install-option2.rst:182
 #: ../neutron-controller-install-option2.rst:337
 #: ../neutron-controller-install-option2.rst:409
-#: ../neutron-controller-install.rst:180 ../nova-compute-install.rst:181
+#: ../neutron-controller-install.rst:180 ../nova-compute-install.rst:191
-#: ../nova-controller-install.rst:291
+#: ../nova-controller-install.rst:299
 msgid ""
 "(Optional) To assist with troubleshooting, enable verbose logging in the "
 "``[DEFAULT]`` section:"
@@ -664,7 +664,7 @@ msgstr ""
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-node.rst:322 ../glance-install.rst:368
 #: ../heat-install.rst:419 ../keystone-install.rst:533
-#: ../nova-compute-install.rst:266 ../nova-controller-install.rst:366
+#: ../nova-compute-install.rst:273 ../nova-controller-install.rst:374
 msgid ""
 "Because this configuration uses an SQL database server, you can remove the "
 "SQLite database file:"
@@ -748,7 +748,7 @@ msgstr ""
 #: ../nova-controller-install.rst:10
 msgid ""
 "Before you install and configure the Compute service, you must create a "
-"database, service credentials, and API endpoint."
+"database, service credentials, and API endpoints."
 msgstr ""
 
 #: ../glance-install.rst:22
@@ -780,7 +780,9 @@ msgid ""
 "package. To use it, install the package:"
 msgstr ""
 
-#: ../nova-controller-install.rst:237
+# #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
+# #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
+#: ../nova-compute-install.rst:128 ../nova-controller-install.rst:237
 msgid ""
 "By default, Compute uses an internal firewall service. Since Networking "
 "includes a firewall service, you must disable the Compute firewall service "
@@ -837,7 +839,7 @@ msgstr ""
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-node.rst:320 ../glance-install.rst:366
 #: ../heat-install.rst:417 ../keystone-install.rst:531
-#: ../nova-compute-install.rst:264 ../nova-controller-install.rst:364
+#: ../nova-compute-install.rst:271 ../nova-controller-install.rst:372
 msgid "By default, the Ubuntu packages create an SQLite database."
 msgstr ""
 
@@ -951,7 +953,7 @@ msgstr ""
 #: ../neutron-compute-install.rst:130
 #: ../neutron-controller-install-option1.rst:157
 #: ../neutron-controller-install-option2.rst:154
-#: ../nova-compute-install.rst:101 ../nova-controller-install.rst:212
+#: ../nova-compute-install.rst:99 ../nova-controller-install.rst:212
 msgid ""
 "Comment out or remove any other options in the ``[keystone_authtoken]`` "
 "section."
@@ -1143,7 +1145,7 @@ msgstr ""
 msgid "Configure unique items on the second storage node:"
 msgstr ""
 
-#: ../glance-verify.rst:91
+#: ../glance-verify.rst:85
 msgid "Confirm upload of the image and validate attributes:"
 msgstr ""
 
@@ -1253,10 +1255,6 @@ msgstr ""
 msgid "Create a subnet on the network:"
 msgstr ""
 
-#: ../glance-verify.rst:31
-msgid "Create a temporary local directory:"
-msgstr ""
-
 #: ../heat-verify.rst:20
 msgid ""
 "Create a test template in the :file:`test-stack.yml` file with the following "
@@ -1654,7 +1652,7 @@ msgstr ""
 msgid "Determine instance options"
 msgstr ""
 
-#: ../nova-compute-install.rst:207
+#: ../nova-compute-install.rst:216
 msgid ""
 "Determine whether your compute node supports hardware acceleration for "
 "virtual machines:"
@@ -1699,8 +1697,8 @@ msgstr ""
 msgid "Download an image from the Image service:"
 msgstr ""
 
-#: ../glance-verify.rst:37
+#: ../glance-verify.rst:31
-msgid "Download the source image into it:"
+msgid "Download the source image:"
 msgstr ""
 
 #: ../dashboard-install.rst:149
@@ -2049,13 +2047,13 @@ msgstr ""
 msgid "Edit the ``/etc/nova/nova.conf`` file:"
 msgstr ""
 
-#: ../nova-compute-install.rst:236
+#: ../nova-compute-install.rst:244
 msgid ""
 "Edit the ``[libvirt]`` section in the :file:`/etc/nova/nova-compute.conf` "
 "file as follows:"
 msgstr ""
 
-#: ../nova-compute-install.rst:224
+#: ../nova-compute-install.rst:233
 msgid ""
 "Edit the ``[libvirt]`` section in the :file:`/etc/nova/nova.conf` file as "
 "follows:"
@@ -2098,11 +2096,11 @@ msgstr ""
 msgid "Ensure proper ownership of the mount point directory structure:"
 msgstr ""
 
-#: ../nova-compute-install.rst:195
+#: ../nova-compute-install.rst:204
 msgid "Ensure the kernel module ``nbd`` is loaded."
 msgstr ""
 
-#: ../nova-compute-install.rst:201
+#: ../nova-compute-install.rst:210
 msgid ""
 "Ensure the module will be loaded on every boot by adding ``nbd`` in the :"
 "file:`/etc/modules-load.d/nbd.conf` file."
@@ -2144,8 +2142,11 @@ msgstr ""
 
 # #-#-#-#-#  neutron-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
+# #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
+# #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  swift-finalize-installation.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../neutron-compute-install.rst:202 ../neutron-controller-install.rst:235
+#: ../nova-compute-install.rst:214 ../nova-controller-install.rst:325
 #: ../swift-finalize-installation.rst:3
 msgid "Finalize installation"
 msgstr ""
@@ -2190,19 +2191,19 @@ msgid ""
 "configuration with the ``ceilometer-common`` package:"
 msgstr ""
 
-#: ../glance-verify.rst:81
+#: ../glance-verify.rst:75
 msgid ""
 "For information about disk and container formats for images, see `Disk and "
 "container formats for images <http://docs.openstack.org/image-guide/content/"
 "image-formats.html>`__ in the ``OpenStack Virtual Machine Image Guide``."
 msgstr ""
 
-#: ../glance-verify.rst:75
+#: ../glance-verify.rst:69
 msgid ""
 "For information about the :command:`glance image-create` parameters, see "
 "`Image service command-line client <http://docs.openstack.org/cli-reference/"
-"content/ glanceclient_commands.html#glanceclient_subcommand_image-create>`__ "
+"content/ glanceclient_commands.html#glanceclient_subcommand_image-"
-"in the ``OpenStack Command-Line Interface Reference``."
+"create_v2>`__ in the ``OpenStack Command-Line Interface Reference``."
 msgstr ""
 
 #: ../glance.rst:29
@@ -2477,21 +2478,21 @@ msgid ""
 "it."
 msgstr ""
 
-#: ../nova-compute-install.rst:144
+#: ../nova-compute-install.rst:157
 msgid ""
 "If the web browser to access remote consoles resides on a host that cannot "
 "resolve the ``controller`` hostname, you must replace ``controller`` with "
 "the management interface IP address of the controller node."
 msgstr ""
 
-#: ../nova-compute-install.rst:214
+#: ../nova-compute-install.rst:223
 msgid ""
 "If this command returns a value of ``one or greater``, your compute node "
 "supports hardware acceleration which typically requires no additional "
 "configuration."
 msgstr ""
 
-#: ../nova-compute-install.rst:218
+#: ../nova-compute-install.rst:227
 msgid ""
 "If this command returns a value of ``zero``, your compute node does not "
 "support hardware acceleration and you must configure ``libvirt`` to use QEMU "
@@ -2613,6 +2614,10 @@ msgid ""
 "management interface on your controller node."
 msgstr ""
 
+#: ../nova-verify.rst:131
+msgid "Ignore any warnings in this output."
+msgstr ""
+
 #: ../overview.rst:103
 msgid ""
 "Implement a deployment tool such as Ansible, Chef, Puppet, or Salt to "
@@ -2695,7 +2700,7 @@ msgstr ""
 #: ../cinder-storage-node.rst:238 ../neutron-compute-install.rst:105
 #: ../neutron-controller-install-option1.rst:132
 #: ../neutron-controller-install-option2.rst:129
-#: ../nova-compute-install.rst:75 ../nova-controller-install.rst:187
+#: ../nova-compute-install.rst:74 ../nova-controller-install.rst:187
 msgid ""
 "In the ``[DEFAULT]`` and ``[keystone_authtoken]`` sections, configure "
 "Identity service access:"
@@ -2779,12 +2784,6 @@ msgid ""
 "networks can access metadata over the network:"
 msgstr ""
 
-#: ../nova-controller-install.rst:242
-msgid ""
-"In the ``[DEFAULT]`` section, configure the VNC proxy to use the management "
-"interface IP address of the controller node:"
-msgstr ""
-
 # #-#-#-#-#  cinder-controller-node.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-node.rst:265 ../nova-controller-install.rst:215
@@ -2795,7 +2794,7 @@ msgstr ""
 
 # #-#-#-#-#  cinder-storage-node.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../cinder-storage-node.rst:266 ../nova-compute-install.rst:104
+#: ../cinder-storage-node.rst:266 ../nova-compute-install.rst:102
 msgid "In the ``[DEFAULT]`` section, configure the ``my_ip`` option:"
 msgstr ""
 
@@ -2844,12 +2843,13 @@ msgid ""
 "token:"
 msgstr ""
 
-#: ../nova-compute-install.rst:118
+#: ../nova-controller-install.rst:291
-msgid ""
+msgid "In the ``[DEFAULT]`` section, disable the in tree EC2 API:"
-"In the ``[DEFAULT]`` section, enable and configure remote console access:"
 msgstr ""
 
-#: ../nova-controller-install.rst:224
+# #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
+# #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
+#: ../nova-compute-install.rst:115 ../nova-controller-install.rst:224
 msgid ""
 "In the ``[DEFAULT]`` section, enable support for the Networking service:"
 msgstr ""
@@ -2954,7 +2954,7 @@ msgstr ""
 
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../nova-compute-install.rst:149 ../nova-controller-install.rst:252
+#: ../nova-compute-install.rst:162 ../nova-controller-install.rst:252
 msgid ""
 "In the ``[glance]`` section, configure the location of the Image service:"
 msgstr ""
@@ -3082,7 +3082,7 @@ msgstr ""
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../cinder-controller-node.rst:274 ../cinder-storage-node.rst:331
-#: ../nova-compute-install.rst:161 ../nova-compute-install.rst:172
+#: ../nova-compute-install.rst:173 ../nova-compute-install.rst:183
 #: ../nova-controller-install.rst:263 ../nova-controller-install.rst:273
 #: ../nova-controller-install.rst:283
 msgid "In the ``[oslo_concurrency]`` section, configure the lock path:"
@@ -3147,6 +3147,16 @@ msgid ""
 "driver:"
 msgstr ""
 
+#: ../nova-controller-install.rst:242
+msgid ""
+"In the ``[vnc]`` section, configure the VNC proxy to use the management "
+"interface IP address of the controller node:"
+msgstr ""
+
+#: ../nova-compute-install.rst:133
+msgid "In the ``[vnc]`` section, enable and configure remote console access:"
+msgstr ""
+
 # #-#-#-#-#  neutron-compute-install-option1.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install-option1.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../neutron-compute-install-option1.rst:26
@@ -3208,6 +3218,12 @@ msgstr ""
 msgid "Install and configure a storage node"
 msgstr ""
 
+# #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
+# #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
+#: ../nova-compute-install.rst:25 ../nova-controller-install.rst:119
+msgid "Install and configure components"
+msgstr ""
+
 #: ../neutron-compute-install.rst:2
 msgid "Install and configure compute node"
 msgstr ""
@@ -3384,7 +3400,7 @@ msgstr ""
 msgid "Launch the instance:"
 msgstr ""
 
-#: ../nova-verify.rst:40
+#: ../nova-verify.rst:39
 msgid ""
 "List API endpoints in the Identity service to verify connectivity with the "
 "Identity service:"
@@ -3433,7 +3449,7 @@ msgstr ""
 msgid "List containers:"
 msgstr ""
 
-#: ../nova-verify.rst:130
+#: ../nova-verify.rst:133
 msgid ""
 "List images in the Image service catalog to verify connectivity with the "
 "Image service:"
@@ -3457,7 +3473,7 @@ msgid ""
 "provider network:"
 msgstr ""
 
-#: ../nova-verify.rst:18
+#: ../nova-verify.rst:17
 msgid ""
 "List service components to verify successful launch and registration of each "
 "process:"
@@ -3833,7 +3849,7 @@ msgstr ""
 # #-#-#-#-#  glance-verify.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  keystone-services.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  keystone-users.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../glance-verify.rst:88 ../keystone-services.rst:85
+#: ../glance-verify.rst:82 ../keystone-services.rst:85
 #: ../keystone-users.rst:43
 msgid ""
 "OpenStack generates IDs dynamically, so you will see different values in the "
@@ -4029,7 +4045,7 @@ msgstr ""
 
 # #-#-#-#-#  cinder-verify.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-verify.pot (Installation Guide 0.1)  #-#-#-#-#
-#: ../cinder-verify.rst:11 ../nova-verify.rst:9
+#: ../cinder-verify.rst:11 ../nova-verify.rst:8
 msgid "Perform these commands on the controller node."
 msgstr ""
 
@@ -4072,7 +4088,7 @@ msgstr ""
 msgid "Populate the Block Storage database:"
 msgstr ""
 
-#: ../nova-controller-install.rst:302 ../nova-controller-install.rst:310
+#: ../nova-controller-install.rst:310 ../nova-controller-install.rst:318
 msgid "Populate the Compute database:"
 msgstr ""
 
@@ -4101,10 +4117,11 @@ msgstr ""
 # #-#-#-#-#  neutron-controller-install-option1.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install-option2.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
+# #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../environment-dependencies.rst:37 ../neutron-compute-install.rst:8
 #: ../neutron-controller-install-option1.rst:7
 #: ../neutron-controller-install-option2.rst:7
-#: ../neutron-controller-install.rst:5
+#: ../neutron-controller-install.rst:5 ../nova-controller-install.rst:8
 msgid "Prerequisites"
 msgstr ""
 
@@ -4203,10 +4220,6 @@ msgstr ""
 msgid "Remove the previously downloaded image file :file:`/tmp/cirros.img`:"
 msgstr ""
 
-#: ../glance-verify.rst:102
-msgid "Remove the temporary local directory and source image:"
-msgstr ""
-
 #: ../swift-initial-rings.rst:53 ../swift-initial-rings.rst:134
 #: ../swift-initial-rings.rst:212
 msgid ""
@@ -4376,7 +4389,7 @@ msgid ""
 "Replace ``KEYSTONE_DBPASS`` with the password you chose for the database."
 msgstr ""
 
-#: ../nova-compute-install.rst:113 ../nova-compute-install.rst:137
+#: ../nova-compute-install.rst:110 ../nova-compute-install.rst:150
 msgid ""
 "Replace ``MANAGEMENT_INTERFACE_IP_ADDRESS`` with the IP address of the "
 "management network interface on your compute node, typically 10.0.0.31 for "
@@ -4445,7 +4458,7 @@ msgstr ""
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../neutron-controller-install-option1.rst:182
 #: ../neutron-controller-install-option2.rst:179
-#: ../nova-compute-install.rst:96 ../nova-controller-install.rst:207
+#: ../nova-compute-install.rst:94 ../nova-controller-install.rst:207
 msgid ""
 "Replace ``NOVA_PASS`` with the password you chose for the ``nova`` user in "
 "the Identity service."
@@ -4543,7 +4556,7 @@ msgstr ""
 #: ../ceilometer-controller-install.rst:376 ../ceilometer-glance.rst:26
 #: ../ceilometer-nova.rst:66 ../ceilometer-swift.rst:89
 #: ../cinder-controller-node.rst:234 ../cinder-storage-node.rst:235
-#: ../heat-install.rst:272 ../nova-compute-install.rst:72
+#: ../heat-install.rst:272 ../nova-compute-install.rst:71
 #: ../nova-controller-install.rst:184
 msgid ""
 "Replace ``RABBIT_PASS`` with the password you chose for the ``openstack`` "
@@ -4657,14 +4670,14 @@ msgstr ""
 # #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../ceilometer-nova.rst:194 ../ceilometer-nova.rst:208
 #: ../neutron-compute-install.rst:232 ../neutron-compute-install.rst:257
-#: ../neutron-compute-install.rst:273 ../nova-compute-install.rst:258
+#: ../neutron-compute-install.rst:273 ../nova-compute-install.rst:265
 msgid "Restart the Compute service:"
 msgstr ""
 
 # #-#-#-#-#  neutron-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../neutron-controller-install.rst:277 ../neutron-controller-install.rst:316
-#: ../nova-controller-install.rst:353
+#: ../nova-controller-install.rst:361
 msgid "Restart the Compute services:"
 msgstr ""
 
@@ -4931,7 +4944,7 @@ msgstr ""
 #: ../glance-install.rst:53 ../glance-verify.rst:24 ../heat-install.rst:40
 #: ../heat-install.rst:340 ../neutron-controller-install.rst:37
 #: ../neutron-verify.rst:4 ../nova-controller-install.rst:41
-#: ../nova-verify.rst:11 ../swift-controller-node.rst:29
+#: ../nova-verify.rst:10 ../swift-controller-node.rst:29
 msgid ""
 "Source the ``admin`` credentials to gain access to admin-only CLI commands:"
 msgstr ""
@@ -4977,13 +4990,13 @@ msgid ""
 "configure them to start when the system boots:"
 msgstr ""
 
-#: ../nova-compute-install.rst:248
+#: ../nova-compute-install.rst:255
 msgid ""
 "Start the Compute service including its dependencies and configure them to "
 "start automatically when the system boots:"
 msgstr ""
 
-#: ../nova-controller-install.rst:321 ../nova-controller-install.rst:337
+#: ../nova-controller-install.rst:329 ../nova-controller-install.rst:345
 msgid ""
 "Start the Compute services and configure them to start when the system boots:"
 msgstr ""
@@ -5727,7 +5740,7 @@ msgid ""
 "option provides the foundation for advanced services such as LBaaS and FWaaS."
 msgstr ""
 
-#: ../nova-compute-install.rst:131
+#: ../nova-compute-install.rst:144
 msgid ""
 "The server component listens on all IP addresses and the proxy component "
 "only listens on the management interface IP address of the compute node. The "
@@ -5954,7 +5967,7 @@ msgid ""
 "features."
 msgstr ""
 
-#: ../nova-verify.rst:36
+#: ../nova-verify.rst:35
 msgid ""
 "This output should indicate four service components enabled on the "
 "controller node and one service component enabled on the compute node."
@@ -6166,14 +6179,13 @@ msgstr ""
 # #-#-#-#-#  cinder-storage-node.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  glance-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  heat-install.pot (Installation Guide 0.1)  #-#-#-#-#
-# #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  swift-controller-node.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  swift-storage-node.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../ceilometer-cinder.rst:10 ../ceilometer-controller-install.rst:11
 #: ../ceilometer-swift.rst:9 ../cinder-controller-node.rst:11
 #: ../cinder-storage-node.rst:17 ../glance-install.rst:20
-#: ../heat-install.rst:11 ../nova-controller-install.rst:8
+#: ../heat-install.rst:11 ../swift-controller-node.rst:15
-#: ../swift-controller-node.rst:15 ../swift-storage-node.rst:18
+#: ../swift-storage-node.rst:18
 msgid "To configure prerequisites"
 msgstr ""
 
@@ -6242,13 +6254,10 @@ msgstr ""
 # #-#-#-#-#  environment-dependencies.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  glance-install.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  heat-install.pot (Installation Guide 0.1)  #-#-#-#-#
-# #-#-#-#-#  nova-compute-install.pot (Installation Guide 0.1)  #-#-#-#-#
-# #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 #: ../ceilometer-controller-install.rst:468 ../ceilometer-nova.rst:170
 #: ../cinder-controller-node.rst:298 ../cinder-storage-node.rst:349
 #: ../dashboard-install.rst:138 ../environment-dependencies.rst:329
 #: ../glance-install.rst:343 ../heat-install.rst:391
-#: ../nova-compute-install.rst:205 ../nova-controller-install.rst:317
 msgid "To finalize installation"
 msgstr ""
 
@@ -6256,14 +6265,6 @@ msgstr ""
 msgid "To install and configure Block Storage controller components"
 msgstr ""
 
-#: ../nova-controller-install.rst:119
-msgid "To install and configure Compute controller components"
-msgstr ""
-
-#: ../nova-compute-install.rst:25
-msgid "To install and configure the Compute hypervisor components"
-msgstr ""
-
 #: ../glance-install.rst:132
 msgid "To install and configure the Image service components"
 msgstr ""
@@ -6389,7 +6390,7 @@ msgstr ""
 msgid "Upload a test file:"
 msgstr ""
 
-#: ../glance-verify.rst:43
+#: ../glance-verify.rst:37
 msgid ""
 "Upload the image to the Image service using the :term:`QCOW2 <QEMU Copy On "
 "Write 2 (QCOW2)>` disk format, :term:`bare` container format, and public "

doc/install-guide/source/locale/ja/LC_MESSAGES/install-guide.po

@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-23 13:58+0000\n"
+"POT-Creation-Date: 2015-09-26 04:56+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -608,13 +608,6 @@ msgstr ""
 "Block Storage サービスをインストールして設定する前に、データベース、サービス"
 "クレデンシャル、API エンドポイントを作成する必要があります。"
 
-msgid ""
-"Before you install and configure the Compute service, you must create a "
-"database, service credentials, and API endpoint."
-msgstr ""
-"Compute をインストールして設定する前に、データベース、サービスクレデンシャ"
-"ル、API エンドポイントを作成する必要があります。"
-
 msgid ""
 "Before you install and configure the Image service, you must create a "
 "database, service credentials, and API endpoint."
@@ -996,9 +989,6 @@ msgstr "1 GB ボリュームを作成します。"
 msgid "Create a ``cinder`` user:"
 msgstr "``cinder`` ユーザーを作成します。"
 
-msgid "Create a temporary local directory:"
-msgstr "一時ローカルディレクトリーを作成します。"
-
 msgid ""
 "Create a test template in the :file:`test-stack.yml` file with the following "
 "content:"
@@ -1324,9 +1314,6 @@ msgstr "テストファイルをダウンロードします。"
 msgid "Download an image from the Image service:"
 msgstr "Image service からイメージをダウンロードします。"
 
-msgid "Download the source image into it:"
-msgstr "そこにソースイメージをダウンロードします。"
-
 msgid ""
 "Due to a packaging bug, the dashboard CSS fails to load properly. Run the "
 "following command to resolve this issue::"
@@ -1759,17 +1746,6 @@ msgstr ""
 "openstack.org/ja/image-guide/content/image-formats.html>`__ を参照してくださ"
 "い。"
 
-msgid ""
-"For information about the :command:`glance image-create` parameters, see "
-"`Image service command-line client <http://docs.openstack.org/cli-reference/"
-"content/ glanceclient_commands.html#glanceclient_subcommand_image-create>`__ "
-"in the ``OpenStack Command-Line Interface Reference``."
-msgstr ""
-":command:`glance image-create` のパラメーターの詳細は ``OpenStack Command-"
-"Line Interface Reference`` の `Image service command-line client <http://"
-"docs.openstack.org/cli-reference/content/ glanceclient_commands."
-"html#glanceclient_subcommand_image-create>`__ を参照してください。"
-
 msgid ""
 "For information on requirements for other back ends, see `Configuration "
 "Reference <http://docs.openstack.org/trunk/ config-reference/content/ "
@@ -2208,13 +2184,6 @@ msgstr ""
 msgid "In the ``[DEFAULT]`` section, configure notifications:"
 msgstr "``[DEFAULT]`` セクションに通知を設定します。"
 
-msgid ""
-"In the ``[DEFAULT]`` section, configure the VNC proxy to use the management "
-"interface IP address of the controller node:"
-msgstr ""
-"``[DEFAULT]`` セクションで、コントローラーノードの管理インターフェース IP ア"
-"ドレスを使用するために、VNC プロキシを設定します。"
-
 # #-#-#-#-#  cinder-controller-node.pot (Installation Guide 0.1)  #-#-#-#-#
 # #-#-#-#-#  nova-controller-install.pot (Installation Guide 0.1)  #-#-#-#-#
 msgid ""
@@ -2275,12 +2244,6 @@ msgid ""
 "token:"
 msgstr "``[DEFAULT]`` セクションに初期管理トークンの値を定義します。"
 
-msgid ""
-"In the ``[DEFAULT]`` section, enable and configure remote console access:"
-msgstr ""
-"``[DEFAULT]`` セクションに、リモートコンソールアクセスを有効化し、設定しま"
-"す。"
-
 msgid "In the ``[DEFAULT]`` section, enable the LVM back end:"
 msgstr "``[DEFAULT]`` セクションで LVM バックエンドを有効化します。"
 
@@ -3289,9 +3252,6 @@ msgid "Remove the previously downloaded image file :file:`/tmp/cirros.img`:"
 msgstr ""
 "前にダウンロードしたイメージファイル :file:`/tmp/cirros.img` を削除します。"
 
-msgid "Remove the temporary local directory and source image:"
-msgstr "一時ローカルディレクトリーとソースイメージを削除します。"
-
 msgid ""
 "Repeat this command for each storage device on each storage node. In the "
 "example architecture, use the command in four variations:"
@@ -5063,12 +5023,6 @@ msgstr "インストールの最終手順"
 msgid "To install and configure Block Storage controller components"
 msgstr "Block Storage コントローラーコンポーネントのインストールと設定方法"
 
-msgid "To install and configure Compute controller components"
-msgstr "Compute のコントローラーのコンポーネントをインストールと設定方法"
-
-msgid "To install and configure the Compute hypervisor components"
-msgstr "Compute のハイパーバイザーコンポーネントのインストールと設定方法"
-
 msgid "To install and configure the Image service components"
 msgstr "Image service のコンポーネントのインストールと設定方法"
 

doc/networking-guide/source/locale/networking-guide.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Networking Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 06:20+0000\n"
+"POT-Creation-Date: 2015-09-26 06:16+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"
@@ -16,6 +16,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../adv_config_qos.rst:86
+msgid ""
+"\"get_policy\": \"rule:regular_user\", \"create_policy\": \"rule:regular_user"
+"\", \"update_policy\": \"rule:regular_user\", \"delete_policy\": \"rule:"
+"regular_user\", \"get_policy_bandwidth_limit_rule\": \"rule:regular_user\", "
+"\"create_policy_bandwidth_limit_rule\": \"rule:regular_user\", "
+"\"delete_policy_bandwidth_limit_rule\": \"rule:regular_user\", "
+"\"update_policy_bandwidth_limit_rule\": \"rule:regular_user\", "
+"\"get_rule_type\": \"rule:regular_user\","
+msgstr ""
+
 #: ../scenario_dvr_ovs.rst:606
 msgid "(Optional) Reduce MTU for GRE/VXLAN project networks."
 msgstr ""
@@ -332,6 +343,10 @@ msgid ""
 "for :term:`Open vSwitch` and :term:`Linux bridge`."
 msgstr ""
 
+#: ../adv_config_qos.rst:73
+msgid "Add 'qos' to extensions in [agent] section."
+msgstr ""
+
 #: ../adv_config_sriov.rst:204
 msgid ""
 "Add ``sriovnicswitch`` as mechanism driver. Edit the file :file:`/etc/"
@@ -417,6 +432,17 @@ msgstr ""
 msgid "Addresses for subnets"
 msgstr ""
 
+#: ../adv_config_qos.rst:209
+msgid "Administrator enforcement"
+msgstr ""
+
+#: ../adv_config_qos.rst:211
+msgid ""
+"Administrators are able to enforce policies on tenant ports or networks. As "
+"long as the policy is not shared, the tenant is not be able to detach any "
+"policy attached to a network or port."
+msgstr ""
+
 #: ../adv_config.rst:3
 msgid "Advanced configuration"
 msgstr ""
@@ -491,6 +517,15 @@ msgid ""
 "the message is transmitted through."
 msgstr ""
 
+#: ../adv_config_qos.rst:37
+msgid ""
+"Any plug-in or ml2 mechanism driver can claim support for some QoS rule "
+"types by providing a plug-in/driver class property called "
+"'supported_qos_rule_types' that returns a list of strings that correspond to "
+"QoS rule types: `<https://github.com/openstack/neutron/blob/master/neutron/"
+"services/qos/qos_consts.py>`"
+msgstr ""
+
 # #-#-#-#-#  config_ml2_plug_in.pot (Networking Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  config_server.pot (Networking Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  deploy_scenario4b.pot (Networking Guide 0.9)  #-#-#-#-#
@@ -892,7 +927,9 @@ msgid ""
 "Ethernet network referred to as a *layer 2 segment*."
 msgstr ""
 
-#: ../config.rst:3
+# #-#-#-#-#  adv_config_qos.pot (Networking Guide 0.9)  #-#-#-#-#
+# #-#-#-#-#  config.pot (Networking Guide 0.9)  #-#-#-#-#
+#: ../adv_config_qos.rst:60 ../config.rst:3
 msgid "Configuration"
 msgstr ""
 
@@ -1402,6 +1439,13 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: ../adv_config_qos.rst:29
+msgid ""
+"Details about the DB models, API extension, and use cases are out of the "
+"scope of this guide but can be found here: `qos spec <http://specs.openstack."
+"org/openstack/neutron-specs/specs/liberty/qos-api-extension.html>`"
+msgstr ""
+
 # #-#-#-#-#  deploy_scenario4b.pot (Networking Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  scenario_provider_ovs.pot (Networking Guide 0.9)  #-#-#-#-#
 #: ../deploy_scenario4b.rst:641 ../scenario_provider_ovs.rst:692
@@ -1534,6 +1578,10 @@ msgid ""
 "assigning the upstream routers GUA address as the gateway for the subnet."
 msgstr ""
 
+#: ../adv_config_qos.rst:66
+msgid "Enable ``qos`` service in ``service_plugins``."
+msgstr ""
+
 #: ../migration_nova_network_to_neutron.rst:96
 msgid ""
 "Enable a nova-api proxy that recreates internal Compute objects from "
@@ -1667,6 +1715,10 @@ msgstr ""
 msgid "Firewalls"
 msgstr ""
 
+#: ../adv_config_qos.rst:107
+msgid "First, create a QoS policy and its bandwidth limit rules:"
+msgstr ""
+
 #: ../adv_config_ipv6.rst:578
 msgid "First, create a network and IPv6 subnet:"
 msgstr ""
@@ -1747,6 +1799,12 @@ msgstr ""
 msgid "For VXLAN project networks:"
 msgstr ""
 
+#: ../adv_config_qos.rst:48
+msgid ""
+"For an ml2 plug-in, the list of supported QoS rule types is defined as a "
+"common subset of rules supported by all active mechanism drivers."
+msgstr ""
+
 #: ../intro_network_namespaces.rst:10
 msgid ""
 "For example, Linux provides namespaces for networking and processes, among "
@@ -1860,6 +1918,10 @@ msgid ""
 "router, avoiding the network node."
 msgstr ""
 
+#: ../adv_config_qos.rst:69
+msgid "For ml2, add 'qos' to extension_drivers in [ml2] section."
+msgstr ""
+
 #: ../intro_basic_networking.rst:353
 msgid ""
 "For networked software applications to communicate over an IP network, they "
@@ -1876,6 +1938,11 @@ msgid ""
 "a particular project uses the VXLAN network type."
 msgstr ""
 
+#: ../adv_config_qos.rst:43
+msgid ""
+"For the Liberty release only egress bandwidth limit rules are supported."
+msgstr ""
+
 #: ../adv_config_ipv6.rst:250
 msgid ""
 "For the above two attributes to be effective, ``enable_dhcp`` must be set to "
@@ -2124,6 +2191,18 @@ msgid ""
 "and for providing optional network information."
 msgstr ""
 
+#: ../adv_config_qos.rst:82
+msgid ""
+"If tenants are trusted to administrate their own QoS policies in your cloud, "
+"neutron's file :file:`policy.json` can be modified to allow this."
+msgstr ""
+
+#: ../adv_config_qos.rst:104
+msgid ""
+"If tenants are trusted to create their own policies, check the trusted "
+"tenants ``policy.json`` configuration section."
+msgstr ""
+
 # #-#-#-#-#  scenario_l3ha_lb.pot (Networking Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  scenario_l3ha_ovs.pot (Networking Guide 0.9)  #-#-#-#-#
 #: ../scenario_l3ha_lb.rst:179 ../scenario_l3ha_ovs.rst:188
@@ -2142,6 +2221,12 @@ msgid ""
 "pci_passhtrough_whitelist entries per host are supported."
 msgstr ""
 
+#: ../adv_config_qos.rst:215
+msgid ""
+"If the policy is shared, the tenant is able to attach or detach such policy "
+"from its own ports and networks."
+msgstr ""
+
 #: ../adv_config_ipv6.rst:663
 msgid ""
 "If the prefix delegation server is configured to delegate globally routable "
@@ -2280,6 +2365,18 @@ msgid ""
 "VLANs, to applications outside of the deployment."
 msgstr ""
 
+#: ../adv_config_qos.rst:199
+msgid ""
+"In order to attach a QoS policy to a network, update an existing network, or "
+"initially create the network attached to the policy."
+msgstr ""
+
+#: ../adv_config_qos.rst:155
+msgid ""
+"In order to detach a port from the QoS policy, simply update again the port "
+"configuration."
+msgstr ""
+
 #: ../adv_config_sriov.rst:36
 msgid "In order to enable SR-IOV, the following steps are required:"
 msgstr ""
@@ -2370,6 +2467,12 @@ msgid ""
 "tenants:"
 msgstr ""
 
+#: ../adv_config_qos.rst:45
+msgid ""
+"In the most simple case, the property can be represented by a simple Python "
+"list defined on the class."
+msgstr ""
+
 #: ../adv_config_sriov.rst:93
 msgid ""
 "In this step, create the VFs for the network interface that will be used for "
@@ -2949,6 +3052,10 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
+#: ../adv_config_qos.rst:95
+msgid "Modify ``/etc/neutron/policy.json`` policy entries as follows::"
+msgstr ""
+
 #: ../misc_libvirt.rst:5
 msgid ""
 "Most OpenStack deployments use the libvirt_ toolkit for interacting with the "
@@ -3021,6 +3128,17 @@ msgstr ""
 msgid "Network configuration in the database"
 msgstr ""
 
+#: ../adv_config_qos.rst:13
+msgid ""
+"Network devices such as switches and routers can mark traffic so that it is "
+"handled with a higher priority to fulfill the QoS conditions agreed under "
+"the SLA. In other cases, certain network traffic such as Voice over IP "
+"(VoIP) and video streaming needs to be transmitted with minimal bandwidth "
+"constraints. On a system without network QoS management, all traffic will be "
+"transmitted in a \"best-effort\" manner making it impossible to guarantee "
+"service delivery to customers."
+msgstr ""
+
 #: ../intro_network_namespaces.rst:3
 msgid "Network namespaces"
 msgstr ""
@@ -3307,6 +3425,10 @@ msgid ""
 "table::"
 msgstr ""
 
+#: ../adv_config_qos.rst:71
+msgid "On agent side (OVS):"
+msgstr ""
+
 #: ../adv_config_sriov.rst:285
 msgid ""
 "On each compute node edit the file :file:`/etc/neutron/plugins/ml2/"
@@ -3347,6 +3469,10 @@ msgid ""
 "etc/nova/nova.conf`:"
 msgstr ""
 
+#: ../adv_config_qos.rst:64
+msgid "On server side:"
+msgstr ""
+
 #: ../scenario_dvr_ovs.rst:1058
 msgid ""
 "On the compute node with the instance, verify creation of the ``fip`` "
@@ -3995,6 +4121,10 @@ msgstr ""
 msgid "Ports"
 msgstr ""
 
+#: ../adv_config_qos.rst:164
+msgid "Ports can be created with a policy attached to them too."
+msgstr ""
+
 #: ../adv_config_ipv6.rst:450
 msgid "Prefix delegation"
 msgstr ""
@@ -4160,6 +4290,33 @@ msgid ""
 "agent."
 msgstr ""
 
+#: ../adv_config_qos.rst:76
+msgid ""
+"QoS currently works with ml2 only (SR-IOV and Open vSwitch are the only "
+"drivers that are enabled for QoS in Liberty release)."
+msgstr ""
+
+#: ../adv_config_qos.rst:25
+msgid ""
+"QoS is an advanced service plug-in. QoS is decoupled from the rest of the "
+"Neutron code on multiple levels and it is available through the ml2 "
+"extension driver."
+msgstr ""
+
+#: ../adv_config_qos.rst:8
+msgid ""
+"QoS is defined as the ability to guarantee certain network requirements like "
+"bandwidth, latency, jitter, and reliability in order to satisfy a Service "
+"Level Agreement (SLA) between an application provider and end users."
+msgstr ""
+
+#: ../adv_config_qos.rst:100
+msgid ""
+"QoS policies are only created by admins with the default ``policy.json``. "
+"Therefore, you should have the Cloud Operator to set up them on behalf of "
+"the Cloud tenants."
+msgstr ""
+
 #: ../migration_nova_network_to_neutron.rst:116
 msgid "Re-enable the hypervisor."
 msgstr ""
@@ -4311,6 +4468,10 @@ msgstr ""
 msgid "Routing services"
 msgstr ""
 
+#: ../adv_config_qos.rst:220
+msgid "Rule modification"
+msgstr ""
+
 #: ../migration_nova_network_to_neutron.rst:94
 msgid ""
 "Run a DB dump/restore tool that creates Networking data structures "
@@ -4373,6 +4534,14 @@ msgstr ""
 msgid "Search in this guide"
 msgstr ""
 
+#: ../adv_config_qos.rst:136
+msgid ""
+"Second, associate the created policy with an existing neutron port. In order "
+"to do this, user extracts the port id to be associated to the already "
+"created policy. In the next example, we will assign the ``bw-limiter`` "
+"policy to the VM with IP address 10.0.0.3"
+msgstr ""
+
 #: ../config_ml2_plug_in.rst:75
 msgid "Security"
 msgstr ""
@@ -4568,6 +4737,12 @@ msgid ""
 "Set the \"has_transitioned\" flag in the Compute hypervisor database/config."
 msgstr ""
 
+#: ../adv_config_qos.rst:67
+msgid ""
+"Set the needed notification_drivers in [qos] section (message_queue is the "
+"default)."
+msgstr ""
+
 #: ../adv_config_ipv6.rst:314
 msgid ""
 "Setting DHCPv6-stateless for ``ipv6_ra_mode`` configures the neutron router "
@@ -4715,6 +4890,10 @@ msgstr ""
 msgid "Summary"
 msgstr ""
 
+#: ../adv_config_qos.rst:35
+msgid "Supported QoS rule types"
+msgstr ""
+
 # #-#-#-#-#  scenario_legacy_lb.pot (Networking Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  scenario_legacy_ovs.pot (Networking Guide 0.9)  #-#-#-#-#
 #: ../scenario_legacy_lb.rst:50 ../scenario_legacy_ovs.rst:50
@@ -5658,8 +5837,10 @@ msgid "The attributes can also be left unset."
 msgstr ""
 
 # #-#-#-#-#  adv_config_ipv6.pot (Networking Guide 0.9)  #-#-#-#-#
+# #-#-#-#-#  adv_config_qos.pot (Networking Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  adv_config_sriov.pot (Networking Guide 0.9)  #-#-#-#-#
-#: ../adv_config_ipv6.rst:12 ../adv_config_sriov.rst:11
+#: ../adv_config_ipv6.rst:12 ../adv_config_qos.rst:23
+#: ../adv_config_sriov.rst:11
 msgid "The basics"
 msgstr ""
 
@@ -6132,6 +6313,14 @@ msgid ""
 "the following components:"
 msgstr ""
 
+#: ../adv_config_qos.rst:52
+msgid ""
+"The list of supported rule types reported by core plug-in is not enforced "
+"when accessing QoS rule resources. This is mostly because then we would not "
+"be able to create any rules while at least one ml2 driver lacks support for "
+"QoS (at the moment of writing, linuxbridge is such a driver)."
+msgstr ""
+
 #: ../scenario_legacy_lb.rst:271 ../scenario_legacy_lb.rst:369
 msgid ""
 "The logical VLAN interface ``device.sid`` forwards the packet to the VLAN "
@@ -6761,6 +6950,12 @@ msgid ""
 "VMs on tenant networks. Required by certain plug-ins only."
 msgstr ""
 
+#: ../adv_config_qos.rst:5
+msgid ""
+"This page serves as a guide for how to use the \"Quality of Service\" (QoS) "
+"functionality of OpenStack Networking."
+msgstr ""
+
 #: ../scenario_l3ha_lb.rst:5
 msgid ""
 "This scenario describes a high-availability implementation of the OpenStack "
@@ -6917,6 +7112,10 @@ msgid ""
 "file:`etc/neutron.conf`::"
 msgstr ""
 
+#: ../adv_config_qos.rst:62
+msgid "To enable the service, follow the steps below:"
+msgstr ""
+
 #: ../scenario_legacy_ovs.rst:87
 msgid ""
 "To improve understanding of network traffic flow, the network and compute "
@@ -7033,6 +7232,10 @@ msgid ""
 "VLAN can communicate."
 msgstr ""
 
+#: ../adv_config_qos.rst:80
+msgid "Trusted tenants policy.json configuration"
+msgstr ""
+
 #: ../config_ml2_plug_in.rst:39
 msgid "Tunnel ID ranges"
 msgstr ""
@@ -7127,7 +7330,9 @@ msgid ""
 "scenario in your environment."
 msgstr ""
 
-#: ../adv_config_ipv6.rst:576
+# #-#-#-#-#  adv_config_ipv6.pot (Networking Guide 0.9)  #-#-#-#-#
+# #-#-#-#-#  adv_config_qos.pot (Networking Guide 0.9)  #-#-#-#-#
+#: ../adv_config_ipv6.rst:576 ../adv_config_qos.rst:98
 msgid "User workflow"
 msgstr ""
 
@@ -7151,6 +7356,10 @@ msgstr ""
 msgid "Using OpenStack Networking with IPv6"
 msgstr ""
 
+#: ../adv_config_qos.rst:3
+msgid "Using OpenStack Networking with QoS"
+msgstr ""
+
 #: ../adv_config_ipv6.rst:254
 msgid "Using SLAAC for addressing"
 msgstr ""
@@ -7396,12 +7605,26 @@ msgstr ""
 msgid "Without the sriov-agent running on each compute node"
 msgstr ""
 
+#: ../adv_config_qos.rst:194
+msgid ""
+"You can attach networks to a QoS policy. The meaning of this is that any "
+"compute port connected to the network will use the network policy by default "
+"unless the port has a specific policy attached to it. Network owned ports "
+"like dhcp and router ports are excluded from network policy application."
+msgstr ""
+
 #: ../intro_basic_networking.rst:200
 msgid ""
 "You can initiate an ARP request manually using the *arping* command. For "
 "example, to send an ARP request to IP address ``10.30.0.132``::"
 msgstr ""
 
+#: ../adv_config_qos.rst:221
+msgid ""
+"You can modify rules at runtime. Rule modifications will be propagated to "
+"any attached port."
+msgstr ""
+
 #: ../adv_config_sriov.rst:281
 msgid ""
 "You only need to enable the sriov-agent if you decided to set "

doc/user-guide-admin/source/locale/ja/LC_MESSAGES/user-guide-admin.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Admin User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 21:49+0000\n"
+"POT-Creation-Date: 2015-09-26 04:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1829,13 +1829,6 @@ msgstr ""
 "ジ` カテゴリーをクリックします。あなたがクラウドユーザー向けに管理できるイ"
 "メージが、このページに表示されます。"
 
-msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` button and "
-"click the :guilabel:`Volumes` category."
-msgstr ""
-":guilabel:`管理` タブで、:guilabel:`システムパネル` を開き、:guilabel:`ボ"
-"リューム` カテゴリーをクリックします。"
-
 msgid ""
 "On the :guilabel:`Admin` tab, open the System Panel and click the :guilabel:"
 "`Host Aggregates` category."

doc/user-guide-admin/source/locale/user-guide-admin.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Admin User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 06:20+0000\n"
+"POT-Creation-Date: 2015-09-26 06:16+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"
@@ -1866,8 +1866,8 @@ msgstr ""
 #: ../dashboard_manage_volumes.rst:24 ../dashboard_manage_volumes.rst:124
 #: ../dashboard_manage_volumes.rst:145
 msgid ""
-"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` button and "
+"On the :guilabel:`Admin` tab, open the :guilabel:`System Panel` and click "
-"click the :guilabel:`Volumes` category."
+"the :guilabel:`Volumes` category."
 msgstr ""
 
 #: ../dashboard_manage_host_aggregates.rst:24

doc/user-guide/source/locale/ja/LC_MESSAGES/user-guide.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 12:29+0000\n"
+"POT-Creation-Date: 2015-09-26 04:57+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1603,15 +1603,6 @@ msgid "By default, when you reboot an instance, it is a soft reboot."
 msgstr ""
 "デフォルトでは、インスタンスをリブートする場合ソフトリブートとなっています。"
 
-msgid ""
-"By default, you cannot attach the configuration drive image as a CD drive "
-"instead of as a disk drive. To attach a CD drive, add the following line to "
-"the ``/etc/nova/nova.conf`` file::"
-msgstr ""
-"デフォルトでは、ディスクドライブの代わりに CD ドライブとしてコンフィグドライ"
-"ブのイメージを接続することはできません。CD ドライブを接続する場合は、``/etc/"
-"nova/nova.conf`` の以下の行を追加します。 "
-
 msgid "Call ``print_server`` again to check the update server details:"
 msgstr "再び ``print_server`` を呼び出し、更新したサーバーの詳細を確認します。"
 
@@ -2713,19 +2704,6 @@ msgstr ""
 "Administrator Guide <http://docs.openstack.org/admin-guide-cloud/"
 "networking_use.html#advanced-networking-operations>`__ を参照してください。"
 
-msgid ""
-"For legacy reasons, you can configure the configuration drive to use VFAT "
-"format instead of ISO 9660. It is unlikely that you would require VFAT "
-"format because ISO 9660 is widely supported across operating systems. "
-"However, to use the VFAT format, add the following line to the ``/etc/nova/"
-"nova.conf`` file::"
-msgstr ""
-"レガシー関連の理由から、config ドライブを ISO 9660 ではなく VFAT フォーマット"
-"を使用するように設定できます。ISO 9660 は様々なオペレーティングシステムで幅広"
-"くサポートされているため、VFAT フォーマットが必要になる可能性は低いはずです。"
-"ただし、VFAT フォーマットを使用する場合は ``/etc/nova/nova.conf`` に以下の行"
-"を指定します。 "
-
 # #-#-#-#-#  cli_swift_archive_auto_extract.pot (End User Guide 1.0.0)
 # #-#-#-#-#
 # #-#-#-#-#  cli_swift_bulk_delete.pot (End User Guide 1.0.0)  #-#-#-#-#
@@ -2959,13 +2937,6 @@ msgstr ""
 msgid "Identity (keystone)"
 msgstr "Identity (keystone)"
 
-msgid ""
-"If a user passes the ``--config-drive true`` flag to the **nova boot** "
-"command, an administrator cannot disable the configuration drive."
-msgstr ""
-"ユーザーが **nova boot** コマンドに ``--config-drive true`` フラグを渡した場"
-"合、管理者はコンフィグドライブを無効化できません。"
-
 msgid ""
 "If an image does not have the cloud-init package installed, you must "
 "customize the image to run a script that mounts the configuration drive on "
@@ -4572,19 +4543,6 @@ msgid ""
 "Note the ID of the security group that you want to use for your instance::"
 msgstr "インスタンスに使用するセキュリティグループの ID をメモします。"
 
-msgid ""
-"Note the effect of the ``--file /etc/network/interfaces=/home/myuser/"
-"instance-interfaces`` argument that was passed to the **nova boot** command. "
-"The contents of this file are contained in the ``openstack/content/0000`` "
-"file on the configuration drive, and the path is specified as ``/etc/network/"
-"interfaces`` in the ``meta_data.json`` file."
-msgstr ""
-"``--file /etc/network/interfaces=/home/myuser/instance-interfaces`` 引数の効"
-"果は、オリジナルの **nova boot** コマンドに渡される点に注意してください。この"
-"ファイルの内容は、コンフィグドライブの `openstack/content/0000`` ファイルに含"
-"まれており、パスは ``meta_data.json`` ファイルに ``/etc/network/interfaces`` "
-"として指定されています。 "
-
 msgid ""
 "Nothing is written to the non-current version container when you initially "
 "``PUT`` an object in the ``current`` container. However, subsequent ``PUT`` "
@@ -5918,18 +5876,6 @@ msgstr ""
 msgid "The ``myDB`` database."
 msgstr "``myDB`` データベース"
 
-msgid ""
-"The ``openstack/2012-08-10/user_data``, ``openstack/latest/user_data``, "
-"``ec2/2009-04-04/user-data``, and ``ec2/latest/user-data`` file are present "
-"only if the ``--user-data`` flag and the contents of the user data file are "
-"passed to the **nova boot** command."
-msgstr ""
-"``openstack/2012-08-10/user_data``、``openstack/latest/user_data``、"
-"``ec2/2009-04-04/user-data``、``ec2/latest/user-data`` のファイルは、"
-"<literal>--user-data</literal> フラグを **nova boot** コマンドに指定した場合"
-"のみ存在し、引数で指定したユーザーデータファイルの内容がこれらのファイルに含"
-"まれます。 "
-
 msgid ""
 "The ``print_flavors`` method is defined in ``utils.py`` and prints the "
 "flavor details:"
@@ -6095,15 +6041,6 @@ msgstr ""
 "このデータベースは、``mysql`` データストア、``mysql-5.5`` という "
 "datastore_version をベースにしています。"
 
-msgid ""
-"The default format of the configuration drive as an ISO 9660 file system. To "
-"explicitly specify the ISO 9660 format, add the following line to the ``/etc/"
-"nova/nova.conf`` file::"
-msgstr ""
-"コンフィグドライブのデフォルトのフォーマットは、ISO 9660 ファイルシステムで"
-"す。ISO 9660 フォーマットを明示的に指定する場合、以下の行を ``/etc/nova/nova."
-"conf`` に含めます。 "
-
 msgid "The deleted instance does not appear in the list."
 msgstr "この一覧には、削除したインスタンスの表示がなくなっています。"
 
@@ -6128,13 +6065,6 @@ msgstr ""
 "このセクションの例は ``print_values`` メソッドと ``print_values_server`` メ"
 "ソッドを使用します。"
 
-msgid ""
-"The files that appear on the configuration drive depend on the arguments "
-"that you pass to the **nova boot** command."
-msgstr ""
-"コンフィグドライブに表示されるファイルは、**nova boot** コマンドに渡した引数"
-"に依存します。"
-
 msgid ""
 "The first step is to list flavors by using the nova ``flavor-list`` command."
 msgstr ""
@@ -6227,24 +6157,6 @@ msgstr ""
 "以下の例は、物理マシンアドレス ``1.2.3.4``、ユーザー名 ``ipmi``、パスワード "
 "``ipmi`` を持つノードを作成するコマンドと実行結果です。"
 
-msgid ""
-"The following example shows the contents of the ``ec2/2009-04-04/meta-data."
-"json`` and the ``ec2/latest/meta-data.json`` files. These files are "
-"identical. The file contents are formatted to improve readability."
-msgstr ""
-"``ec2/2009-04-04/meta-data.json``、``ec2/latest/meta-data.json`` (これらの"
-"ファイルは 2 つとも同じ内容です) の内容の例を以下に示しています。読みやすいよ"
-"うにフォーマットを少し改善しています。 "
-
-msgid ""
-"The following example shows the contents of the ``openstack/2012-08-10/"
-"meta_data.json`` and ``openstack/latest/meta_data.json`` files. These files "
-"are identical. The file contents are formatted for readability."
-msgstr ""
-"``openstack/2012-08-10/meta_data.json``、``openstack/latest/meta_data.json`` "
-"(これらのファイルは 2 つとも同じ内容です) の内容の例を以下に示しています。読"
-"みやすいようにフォーマットを少し改善しています。"
-
 msgid ""
 "The following example shows the failure response in ``application/json`` "
 "format."
@@ -7237,13 +7149,6 @@ msgstr ""
 "``allow_versions`` オプションを ``TRUE`` に設定するよう、クラウドプロバイダー"
 "に依頼します。"
 
-msgid ""
-"To enable the configuration drive, pass the ``--config-drive true`` "
-"parameter to the **nova boot** command."
-msgstr ""
-"**nova boot** コマンドに ``--config-drive true`` パラメーターを付け、コンフィ"
-"グドライブを有効化します。"
-
 msgid ""
 "To ensure that the key pair has been successfully imported, list key pairs "
 "as follows::"
@@ -7603,17 +7508,6 @@ msgstr ""
 "インスタンスに SSH 接続するために、ダウンロードしたキーペアファイルを使用しま"
 "す。"
 
-msgid ""
-"To use configuration drive with Hyper-V, you must set the ``mkisofs_cmd`` "
-"value to the full path to an ``mkisofs.exe`` installation. Additionally, you "
-"must set the ``qemu_img_cmd`` value in the ``hyperv`` configuration section "
-"to the full path to an ``qemu-img`` command installation."
-msgstr ""
-"Hyper-V でコンフィグドライブを使用する場合、``mkisofs_cmd`` の値を ``mkisofs."
-"exe`` のインストレーションへの完全パスに設定する必要があります。さらに、"
-"``qemu-img`` コマンドのインストレーションへの完全パスに `hyperv`` 設定セク"
-"ションの ``qemu_img_cmd`` フラグの値を設定する必要があります。"
-
 msgid ""
 "To use configuration drive with libvirt, XenServer, or VMware, you must "
 "first install the genisoimage package on each compute host. Otherwise, "
@@ -7901,13 +7795,6 @@ msgstr ""
 "スを設定します。genisoimage が ``nova-compute`` サービスと同じパスの場合、こ"
 "のフラグを設定する必要がありません。"
 
-msgid ""
-"Use the ``nova baremetal-node-list`` command to view the details for a bare-"
-"metal node:"
-msgstr ""
-"``nova baremetal-node-list`` コマンドを使用して、全ベアメタルノードとインター"
-"フェースを表示します。"
-
 msgid ""
 "Use the ``prefix`` and ``delimiter`` parameters to view the objects inside a "
 "pseudo-directory, including further nested pseudo-directories."
@@ -8369,13 +8256,6 @@ msgid ""
 "You can also authenticate by explicitly specifying the endpoint and token:"
 msgstr "エンドポイントとトークンを明示的に指定して、認証することもできます。"
 
-msgid ""
-"You can also configure the Compute service to always create a configuration "
-"drive by setting the following option in the ``/etc/nova/nova.conf`` file::"
-msgstr ""
-"``/etc/nova/nova.conf`` ファイルに以下のオプションを設定することにより、常に"
-"コンフィグドライブを作成するよう、Compute サービスを設定することもできます。"
-
 msgid ""
 "You can also filter the image list by using ``grep`` to find a specific "
 "image, as follows::"
@@ -8748,15 +8628,6 @@ msgstr ""
 "スをリストアするために、バックアップを使用できます。リストア処理は、データ"
 "ベースインスタンスを作成します。"
 
-msgid ""
-"You can use the **blkid** command to identify the block device that "
-"corresponds to the configuration drive. For example, when you boot the "
-"CirrOS image with the ``m1.tiny`` flavor, the device is ``/dev/vdb``:"
-msgstr ""
-"コンフィグドライブに対応するブロックデバイスを識別するために、**blkid** コマ"
-"ンドを使用できます。たとえば、``m1.tiny`` フレーバーで CirrOS イメージを起動"
-"するとき、このデバイスは ``/dev/vdb`` になります。"
-
 msgid ""
 "You can use your Object Storage account to create a static website. This "
 "static website is created with Static Web middleware and serves container "

doc/user-guide/source/locale/user-guide.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: End User Guide 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-31 06:12+0000\n"
+"POT-Creation-Date: 2015-09-26 06:16+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"
@@ -1619,11 +1619,11 @@ msgstr ""
 msgid "By default, when you reboot an instance, it is a soft reboot."
 msgstr ""
 
-#: ../cli_config_drive.rst:253
+#: ../cli_config_drive.rst:261
 msgid ""
 "By default, you cannot attach the configuration drive image as a CD drive "
 "instead of as a disk drive. To attach a CD drive, add the following line to "
-"the ``/etc/nova/nova.conf`` file::"
+"the :file:`/etc/nova/nova.conf` file::"
 msgstr ""
 
 #: ../sdk_compute_apis.rst:315
@@ -1977,11 +1977,11 @@ msgstr ""
 msgid "Compute (nova)"
 msgstr ""
 
-#: ../cli_config_drive.rst:131
+#: ../cli_config_drive.rst:139
 msgid "Configuration drive contents"
 msgstr ""
 
-#: ../cli_config_drive.rst:245
+#: ../cli_config_drive.rst:253
 msgid "Configuration drive format"
 msgstr ""
 
@@ -2536,7 +2536,7 @@ msgstr ""
 msgid "Dynamic large objects"
 msgstr ""
 
-#: ../cli_config_drive.rst:193
+#: ../cli_config_drive.rst:201
 msgid "EC2 metadata format"
 msgstr ""
 
@@ -2603,7 +2603,7 @@ msgstr ""
 msgid "End-to-end integrity"
 msgstr ""
 
-#: ../cli_config_drive.rst:106
+#: ../cli_config_drive.rst:114
 msgid ""
 "Ensure that you use at least version 0.3.1 of CirrOS for configuration drive "
 "support."
@@ -2835,13 +2835,13 @@ msgid ""
 "admin-guide-cloud/networking_use.html#advanced-networking-operations>`__."
 msgstr ""
 
-#: ../cli_config_drive.rst:259
+#: ../cli_config_drive.rst:267
 msgid ""
 "For legacy reasons, you can configure the configuration drive to use VFAT "
 "format instead of ISO 9660. It is unlikely that you would require VFAT "
 "format because ISO 9660 is widely supported across operating systems. "
-"However, to use the VFAT format, add the following line to the ``/etc/nova/"
+"However, to use the VFAT format, add the following line to the :file:`/etc/"
-"nova.conf`` file::"
+"nova/nova.conf` file::"
 msgstr ""
 
 # #-#-#-#-#  cli_swift_archive_auto_extract.pot (End User Guide 1.0.0)  #-#-#-#-#
@@ -3071,10 +3071,10 @@ msgstr ""
 msgid "Identity (keystone)"
 msgstr ""
 
-#: ../cli_config_drive.rst:93
+#: ../cli_config_drive.rst:99
 msgid ""
-"If a user passes the ``--config-drive true`` flag to the **nova boot** "
+"If a user passes the ``--config-drive true`` flag to the :command:`nova "
-"command, an administrator cannot disable the configuration drive."
+"boot` command, an administrator cannot disable the configuration drive."
 msgstr ""
 
 #: ../cli_config_drive.rst:52
@@ -3199,7 +3199,7 @@ msgid ""
 "nova-network.log file."
 msgstr ""
 
-#: ../cli_config_drive.rst:267
+#: ../cli_config_drive.rst:275
 msgid "If you choose VFAT, the configuration drive is 64 MB."
 msgstr ""
 
@@ -3346,13 +3346,13 @@ msgid ""
 "must create a custom flavor by using the nova ``flavor-create`` command."
 msgstr ""
 
-#: ../cli_config_drive.rst:109
+#: ../cli_config_drive.rst:117
 msgid ""
 "If your guest operating system does not use ``udev``, the ``/dev/disk/by-"
 "label`` directory is not present."
 msgstr ""
 
-#: ../cli_config_drive.rst:97
+#: ../cli_config_drive.rst:103
 msgid ""
 "If your guest operating system supports accessing disk by label, you can "
 "mount the configuration drive as the ``/dev/disk/by-label/"
@@ -3442,7 +3442,7 @@ msgstr ""
 msgid "In addition, you must:"
 msgstr ""
 
-#: ../cli_config_drive.rst:269
+#: ../cli_config_drive.rst:279
 msgid ""
 "In current version (Kilo) of OpenStack Compute, live migration with "
 "``config_drive`` on local disk is forbidden due to the bug in libvirt of "
@@ -3720,7 +3720,7 @@ msgid ""
 "of options that work with MySQL 5.5."
 msgstr ""
 
-#: ../cli_config_drive.rst:133
+#: ../cli_config_drive.rst:141
 msgid ""
 "In this example, the contents of the configuration drive are as follows::"
 msgstr ""
@@ -4006,7 +4006,7 @@ msgstr ""
 msgid "List all users"
 msgstr ""
 
-#: ../cli_manage_bare_metal_nodes.rst:133
+#: ../cli_manage_bare_metal_nodes.rst:134
 msgid "List bare-metal nodes and interfaces"
 msgstr ""
 
@@ -4616,13 +4616,13 @@ msgid ""
 "Note the ID of the security group that you want to use for your instance::"
 msgstr ""
 
-#: ../cli_config_drive.rst:185
+#: ../cli_config_drive.rst:193
 msgid ""
 "Note the effect of the ``--file /etc/network/interfaces=/home/myuser/"
-"instance-interfaces`` argument that was passed to the **nova boot** command. "
+"instance-interfaces`` argument that was passed to the :command:`nova boot` "
-"The contents of this file are contained in the ``openstack/content/0000`` "
+"command. The contents of this file are contained in the :file:`openstack/"
-"file on the configuration drive, and the path is specified as ``/etc/network/"
+"content/0000` file on the configuration drive, and the path is specified as :"
-"interfaces`` in the ``meta_data.json`` file."
+"file:`/etc/network/interfaces` in the :file:`meta_data.json` file."
 msgstr ""
 
 #: ../cli_swift_set_object_versions.rst:78
@@ -4734,7 +4734,7 @@ msgstr ""
 msgid "On the :guilabel:`Routers` tab, click the name of the router."
 msgstr ""
 
-#: ../cli_config_drive.rst:125
+#: ../cli_config_drive.rst:133
 msgid "Once identified, you can mount the device::"
 msgstr ""
 
@@ -4829,7 +4829,7 @@ msgid ""
 "client commands."
 msgstr ""
 
-#: ../cli_config_drive.rst:151
+#: ../cli_config_drive.rst:159
 msgid "OpenStack metadata format"
 msgstr ""
 
@@ -5352,7 +5352,7 @@ msgstr ""
 msgid "Set site index file"
 msgstr ""
 
-#: ../cli_manage_bare_metal_nodes.rst:121
+#: ../cli_manage_bare_metal_nodes.rst:122
 msgid ""
 "Set the ``--availability_zone`` parameter to specify which zone or node to "
 "use to start the server. Separate the zone from the host name with a comma. "
@@ -5415,7 +5415,7 @@ msgid ""
 "also be entirely removed."
 msgstr ""
 
-#: ../cli_manage_bare_metal_nodes.rst:149
+#: ../cli_manage_bare_metal_nodes.rst:150
 msgid "Show details for a bare-metal node"
 msgstr ""
 
@@ -5644,6 +5644,14 @@ msgid ""
 "destination file system for the image file."
 msgstr ""
 
+#: ../cli_config_drive.rst:247
+msgid ""
+"The :file:`openstack/2012-08-10/user_data`, :file:`openstack/latest/"
+"user_data`, :file:`ec2/2009-04-04/user-data`, and :file:`ec2/latest/user-"
+"data` file are present only if the ``--user-data`` flag and the contents of "
+"the user data file are passed to the :command:`nova boot` command."
+msgstr ""
+
 #: ../dashboard_manage_images.rst:36
 msgid "The :guilabel:`Create An Image` dialog box appears."
 msgstr ""
@@ -5896,14 +5904,6 @@ msgstr ""
 msgid "The ``myDB`` database."
 msgstr ""
 
-#: ../cli_config_drive.rst:239
-msgid ""
-"The ``openstack/2012-08-10/user_data``, ``openstack/latest/user_data``, "
-"``ec2/2009-04-04/user-data``, and ``ec2/latest/user-data`` file are present "
-"only if the ``--user-data`` flag and the contents of the user data file are "
-"passed to the **nova boot** command."
-msgstr ""
-
 #: ../sdk_compute_apis.rst:361
 msgid ""
 "The ``print_flavors`` method is defined in ``utils.py`` and prints the "
@@ -6054,11 +6054,11 @@ msgid ""
 "datastore\\_version."
 msgstr ""
 
-#: ../cli_config_drive.rst:247
+#: ../cli_config_drive.rst:255
 msgid ""
 "The default format of the configuration drive as an ISO 9660 file system. To "
-"explicitly specify the ISO 9660 format, add the following line to the ``/etc/"
+"explicitly specify the ISO 9660 format, add the following line to the :file:"
-"nova/nova.conf`` file::"
+"`/etc/nova/nova.conf` file::"
 msgstr ""
 
 #: ../cli_delete_an_instance.rst:38
@@ -6089,10 +6089,10 @@ msgid ""
 "``print_values_server`` methods:"
 msgstr ""
 
-#: ../cli_config_drive.rst:147
+#: ../cli_config_drive.rst:155
 msgid ""
 "The files that appear on the configuration drive depend on the arguments "
-"that you pass to the **nova boot** command."
+"that you pass to the :command:`nova boot` command."
 msgstr ""
 
 #: ../create_db.rst:23
@@ -6170,18 +6170,18 @@ msgid ""
 "``ipmi``."
 msgstr ""
 
-#: ../cli_config_drive.rst:195
+#: ../cli_config_drive.rst:203
 msgid ""
-"The following example shows the contents of the ``ec2/2009-04-04/meta-data."
+"The following example shows the contents of the :file:`ec2/2009-04-04/meta-"
-"json`` and the ``ec2/latest/meta-data.json`` files. These files are "
+"data.json` and the :file:`ec2/latest/meta-data.json` files. These files are "
 "identical. The file contents are formatted to improve readability."
 msgstr ""
 
-#: ../cli_config_drive.rst:153
+#: ../cli_config_drive.rst:161
 msgid ""
-"The following example shows the contents of the ``openstack/2012-08-10/"
+"The following example shows the contents of the :file:`openstack/2012-08-10/"
-"meta_data.json`` and ``openstack/latest/meta_data.json`` files. These files "
+"meta_data.json` and :file:`openstack/latest/meta_data.json` files. These "
-"are identical. The file contents are formatted for readability."
+"files are identical. The file contents are formatted for readability."
 msgstr ""
 
 #: ../cli_swift_archive_auto_extract.rst:114
@@ -7076,7 +7076,7 @@ msgstr ""
 #: ../cli_config_drive.rst:78
 msgid ""
 "To enable the configuration drive, pass the ``--config-drive true`` "
-"parameter to the **nova boot** command."
+"parameter to the :command:`nova boot` command."
 msgstr ""
 
 #: ../cli_nova_configure_access_security_for_instances.rst:90
@@ -7395,7 +7395,7 @@ msgid ""
 "To use configuration drive with Hyper-V, you must set the ``mkisofs_cmd`` "
 "value to the full path to an ``mkisofs.exe`` installation. Additionally, you "
 "must set the ``qemu_img_cmd`` value in the ``hyperv`` configuration section "
-"to the full path to an ``qemu-img`` command installation."
+"to the full path to an :command:`qemu-img` command installation."
 msgstr ""
 
 #: ../cli_config_drive.rst:31
@@ -7611,13 +7611,19 @@ msgstr ""
 msgid "Use ssh to connect to the instance"
 msgstr ""
 
-#: ../cli_manage_bare_metal_nodes.rst:135
+#: ../cli_manage_bare_metal_nodes.rst:136
 msgid ""
 "Use the :command:`nova baremetal-node-list` command to view all bare-metal "
 "nodes and interfaces. When a node is in use, its status includes the UUID of "
 "the instance that runs on it:"
 msgstr ""
 
+#: ../cli_manage_bare_metal_nodes.rst:152
+msgid ""
+"Use the :command:`nova baremetal-node-list` command to view the details for "
+"a bare-metal node:"
+msgstr ""
+
 #: ../cli_manage_ip_addresses.rst:27
 msgid ""
 "Use the :command:`nova floating-ip-*` commands to manage floating IP "
@@ -7686,12 +7692,6 @@ msgid ""
 "service, you do not need to set this flag."
 msgstr ""
 
-#: ../cli_manage_bare_metal_nodes.rst:151
-msgid ""
-"Use the ``nova baremetal-node-list`` command to view the details for a bare-"
-"metal node:"
-msgstr ""
-
 #: ../cli_swift_pseudo_hierarchical_folders_directories.rst:66
 msgid ""
 "Use the ``prefix`` and ``delimiter`` parameters to view the objects inside a "
@@ -7749,7 +7749,7 @@ msgstr ""
 msgid "Used to manage volumes and volume snapshots that attach to instances."
 msgstr ""
 
-#: ../cli_config_drive.rst:237
+#: ../cli_config_drive.rst:245
 msgid "User data"
 msgstr ""
 
@@ -8080,10 +8080,11 @@ msgid ""
 "You can also authenticate by explicitly specifying the endpoint and token:"
 msgstr ""
 
-#: ../cli_config_drive.rst:87
+#: ../cli_config_drive.rst:91
 msgid ""
 "You can also configure the Compute service to always create a configuration "
-"drive by setting the following option in the ``/etc/nova/nova.conf`` file::"
+"drive by setting the following option in the :file:`/etc/nova/nova.conf` "
+"file::"
 msgstr ""
 
 #: ../cli_launch_instances.rst:108
@@ -8389,9 +8390,9 @@ msgid ""
 "restore process creates a database instance."
 msgstr ""
 
-#: ../cli_config_drive.rst:112
+#: ../cli_config_drive.rst:120
 msgid ""
-"You can use the **blkid** command to identify the block device that "
+"You can use the :command:`blkid` command to identify the block device that "
 "corresponds to the configuration drive. For example, when you boot the "
 "CirrOS image with the ``m1.tiny`` flavor, the device is ``/dev/vdb``:"
 msgstr ""
@@ -8680,7 +8681,7 @@ msgstr ""
 msgid "``database1``, ``database2``, ``database3``"
 msgstr ""
 
-#: ../cli_manage_bare_metal_nodes.rst:129
+#: ../cli_manage_bare_metal_nodes.rst:130
 msgid ""
 "``host`` is optional for the ``--availability_zone`` parameter. You can "
 "simply specify ``zone:,node``, still including the comma."