Imported Translations from Zanata

For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: Ife76adf36b022a6657d7ef2e17c46006206fdc2d
7 years ago · 499bb45693
parent 9b5502664b
commit 499bb45693
12 changed files with 1498 additions and 1326 deletions
--- a/doc/common-rst/source/locale/common-rst.pot
+++ b/doc/common-rst/source/locale/common-rst.pot
--- a/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
+++ b/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
@ -17,11 +17,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Common documents 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-09 06:00+0000\n"
+"POT-Creation-Date: 2015-12-11 04:02+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-12-08 05:53+0000\n"
+"PO-Revision-Date: 2015-12-10 05:44+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@ -3063,6 +3063,9 @@ msgstr "Cloudbase-Init"
 msgid "Clustering"
 msgstr "Clustering"

+msgid "Clustering service"
+msgstr "Clustering service"
+
 msgid "Code name for the DNS service project for OpenStack."
 msgstr "OpenStack の DNS サービスプロジェクトのコード名。"

@ -3328,6 +3331,9 @@ msgstr "OpenStack 上への Hadoop クラスターの作成と管理。"
 msgid "Creates and manages applications."
 msgstr "アプリケーションの作成と管理。"

+msgid "Creates and manages clustering services."
+msgstr "クラスタリングサービスの作成と管理。"
+
 msgid "Creates and manages containers."
 msgstr "コンテナーの作成と管理。"

@ -7608,12 +7614,8 @@ msgstr ""
 "ス。API エンドポイントは、認証、売上データ、パフォーマンス統計、Compute 仮想"
 "マシンコマンド、センサスデータなどのような数多くのサービスを提供できます。"

-msgid ""
-"The dashboard is available on the node with the ``nova-dashboard`` server "
-"role."
-msgstr ""
-"ダッシュボードは ``nova-dashboard`` サーバーロールを持つノードにおいて利用で"
-"きます。"
+msgid "The dashboard is generally installed on the controller node."
+msgstr "ダッシュボードは通常はコントローラーノードにインストールされます。"

 msgid ""
 "The dashboard is usually deployed through `mod_wsgi <http://code.google.com/"
@ -9079,6 +9081,11 @@ msgid ""
 msgstr ""
 "`バグ: Bare metal service (ironic) <https://bugs.launchpad.net/ironic>`__"

+msgid ""
+"`Bugs: Clustering service (senlin) <https://bugs.launchpad.net/senlin>`__"
+msgstr ""
+"`Bugs: Clustering service (senlin) <https://bugs.launchpad.net/senlin>`__"
+
 msgid ""
 "`Bugs: Containers service (magnum) <https://bugs.launchpad.net/magnum>`__"
 msgstr ""
@ -9520,6 +9527,9 @@ msgstr "``python-troveclient`` コマンドラインクライアント"
 msgid "``sahara`` - Data Processing API"
 msgstr "``sahara`` - Data Processing API"

+msgid "``senlin`` - Clustering service API"
+msgstr "``senlin`` - Clustering service API"
+
 msgid "``show_multiple_locations = True``"
 msgstr "``show_multiple_locations = True``"

@ -10604,6 +10614,9 @@ msgstr "python-openstackclient"
 msgid "python-saharaclient"
 msgstr "python-saharaclient"

+msgid "python-senlinclient"
+msgstr "python-senlinclient"
+
 msgid "python-swiftclient"
 msgstr "python-swiftclient"

--- a/doc/common/locale/common.pot
+++ b/doc/common/locale/common.pot
@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-12-08 06:25+0000\n"
+"POT-Creation-Date: 2015-12-11 06:13+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"
@ -470,114 +470,118 @@ msgid "<literal>sahara</literal> - Data Processing API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:217(para)
-msgid "<literal>swift</literal> - Object Storage API"
+msgid "<literal>senlin</literal> - Clustering service API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:221(para)
-msgid "<literal>trove</literal> - Database service API"
+msgid "<literal>swift</literal> - Object Storage API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:225(para)
-msgid "<literal>tuskar</literal> - Deployment service API"
+msgid "<literal>trove</literal> - Database service API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:229(para)
-msgid "<literal>magnum</literal> - Containers service API"
+msgid "<literal>tuskar</literal> - Deployment service API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:233(para)
-msgid "<literal>manila</literal> - Shared file systems API"
+msgid "<literal>magnum</literal> - Containers service API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:237(para)
-msgid "<literal>mistral</literal> - Workflow service API"
+msgid "<literal>manila</literal> - Shared file systems API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:241(para)
-msgid "<literal>murano</literal> - Application catalog API"
+msgid "<literal>mistral</literal> - Workflow service API"
 msgstr ""

 #: ./doc/common/section_cli_install.xml:245(para)
+msgid "<literal>murano</literal> - Application catalog API"
+msgstr ""
+
+#: ./doc/common/section_cli_install.xml:249(para)
 msgid "<literal>openstack</literal> - Common OpenStack client supporting multiple services"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:255(para)
+#: ./doc/common/section_cli_install.xml:259(para)
 msgid "<literal>keystone</literal> - Identity service API and extensions"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:250(para)
+#: ./doc/common/section_cli_install.xml:254(para)
 msgid "The following CLIs are deprecated in favor of <literal>openstack</literal>, the Common OpenStack client supporting multiple services: <placeholder-1/>"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:261(para)
+#: ./doc/common/section_cli_install.xml:265(para)
 msgid "The following example shows the command for installing the nova client with <placeholder-1/>."
 msgstr ""

-#: ./doc/common/section_cli_install.xml:265(title)
+#: ./doc/common/section_cli_install.xml:269(title)
 msgid "Installing with pip"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:266(para)
+#: ./doc/common/section_cli_install.xml:270(para)
 msgid "Use <package>pip</package> to install the OpenStack clients on a Linux, Mac OS X, or Microsoft Windows system. It is easy to use and ensures that you get the latest version of the client from the <link xlink:href=\"https://pypi.python.org/pypi\">Python Package Index</link>. Also, <package>pip</package> enables you to update or remove a package."
 msgstr ""

-#: ./doc/common/section_cli_install.xml:273(para)
+#: ./doc/common/section_cli_install.xml:277(para)
 msgid "Install each client separately by using the following command:"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:276(para)
+#: ./doc/common/section_cli_install.xml:280(para)
 msgid "For Mac OS X or Linux:"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:277(replaceable) ./doc/common/section_cli_install.xml:279(replaceable) ./doc/common/section_cli_install.xml:292(replaceable) ./doc/common/section_cli_install.xml:295(replaceable) ./doc/common/section_cli_install.xml:298(replaceable) ./doc/common/section_cli_install.xml:305(replaceable) ./doc/common/section_cli_install.xml:314(replaceable) ./doc/common/section_cli_install.xml:317(replaceable) ./doc/common/section_cli_version.xml:10(replaceable)
+#: ./doc/common/section_cli_install.xml:281(replaceable) ./doc/common/section_cli_install.xml:283(replaceable) ./doc/common/section_cli_install.xml:296(replaceable) ./doc/common/section_cli_install.xml:299(replaceable) ./doc/common/section_cli_install.xml:302(replaceable) ./doc/common/section_cli_install.xml:309(replaceable) ./doc/common/section_cli_install.xml:318(replaceable) ./doc/common/section_cli_install.xml:321(replaceable) ./doc/common/section_cli_version.xml:10(replaceable)
 msgid "PROJECT"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:278(para)
+#: ./doc/common/section_cli_install.xml:282(para)
 msgid "For Microsoft Windows:"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:283(title)
+#: ./doc/common/section_cli_install.xml:287(title)
 msgid "Installing from packages"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:284(para)
+#: ./doc/common/section_cli_install.xml:288(para)
 msgid "RDO, openSUSE, SUSE Linux Enterprise, Debian, and Ubuntu have client packages that can be installed without <placeholder-1/>."
 msgstr ""

-#: ./doc/common/section_cli_install.xml:287(para)
+#: ./doc/common/section_cli_install.xml:291(para)
 msgid "On Red Hat Enterprise Linux, CentOS, or Fedora, use <placeholder-1/> to install the clients from the packaged versions available in <link xlink:href=\"https://www.rdoproject.org/\">RDO</link>: <placeholder-2/>"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:293(para)
+#: ./doc/common/section_cli_install.xml:297(para)
 msgid "For Ubuntu or Debian, use <placeholder-1/> to install the clients from the packaged versions: <placeholder-2/>"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:296(para)
+#: ./doc/common/section_cli_install.xml:300(para)
 msgid "For openSUSE, use <placeholder-1/> to install the clients from the distribution packages Service: <placeholder-2/>"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:299(para)
+#: ./doc/common/section_cli_install.xml:303(para)
 msgid "For SUSE Linux Enterprise Server, use <placeholder-1/> to install the clients from the distribution packages in the Open Build Service. First, add the Open Build Service repository: <placeholder-2/> Then you can install the packages: <placeholder-3/>"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:310(title)
+#: ./doc/common/section_cli_install.xml:314(title)
 msgid "Upgrade or remove clients"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:311(para)
+#: ./doc/common/section_cli_install.xml:315(para)
 msgid "To upgrade a client, add the <literal>--upgrade</literal> option to the <placeholder-1/> command:"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:315(para)
+#: ./doc/common/section_cli_install.xml:319(para)
 msgid "To remove the a client, run the <placeholder-1/> command:"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:320(title)
+#: ./doc/common/section_cli_install.xml:324(title)
 msgid "What's next"
 msgstr ""

-#: ./doc/common/section_cli_install.xml:321(para)
+#: ./doc/common/section_cli_install.xml:325(para)
 msgid "Before you can run client commands, you must create and source the <filename><replaceable>PROJECT</replaceable>-openrc.sh</filename> file to set environment variables. See <xref linkend=\"cli_openrc\"/>."
 msgstr ""

@ -597,7 +601,7 @@ msgstr ""
 msgid "For the available OpenStack documentation, see <link xlink:href=\"http://docs.openstack.org\">docs.openstack.org</link>."
 msgstr ""

-#: ./doc/common/app_support.xml:20(para) ./doc/common/app_support.xml:399(para)
+#: ./doc/common/app_support.xml:20(para) ./doc/common/app_support.xml:404(para)
 msgid "To provide feedback on documentation, join and use the <email>openstack-docs@lists.openstack.org</email> mailing list at <link xlink:href=\"http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs\">OpenStack Documentation Mailing List</link>, or <link xlink:href=\"https://bugs.launchpad.net/openstack-manuals/+filebug\">report a bug</link>."
 msgstr ""

@ -778,114 +782,118 @@ msgid "Bugs: Bare metal service (ironic)"
 msgstr ""

 #: ./doc/common/app_support.xml:295(link)
-msgid "Bugs: Containers service (magnum)"
+msgid "Bugs: Clustering service (senlin)"
 msgstr ""

 #: ./doc/common/app_support.xml:300(link)
+msgid "Bugs: Containers service (magnum)"
+msgstr ""
+
+#: ./doc/common/app_support.xml:305(link)
 msgid "Bugs: Data processing service (sahara)"
 msgstr ""

-#: ./doc/common/app_support.xml:306(link)
+#: ./doc/common/app_support.xml:311(link)
 msgid "Bugs: Database service (trove)"
 msgstr ""

-#: ./doc/common/app_support.xml:311(link)
+#: ./doc/common/app_support.xml:316(link)
 msgid "Bugs: Deployment service (tuskar)"
 msgstr ""

-#: ./doc/common/app_support.xml:316(link)
+#: ./doc/common/app_support.xml:321(link)
 msgid "Bugs: Key Manager service (barbican)"
 msgstr ""

-#: ./doc/common/app_support.xml:321(link)
+#: ./doc/common/app_support.xml:326(link)
 msgid "Bugs: Monitoring (monasca)"
 msgstr ""

-#: ./doc/common/app_support.xml:326(link)
+#: ./doc/common/app_support.xml:331(link)
 msgid "Bugs: Orchestration (heat)"
 msgstr ""

-#: ./doc/common/app_support.xml:331(link)
+#: ./doc/common/app_support.xml:336(link)
 msgid "Bugs: Rating (cloudkitty)"
 msgstr ""

-#: ./doc/common/app_support.xml:336(link)
+#: ./doc/common/app_support.xml:341(link)
 msgid "Bugs: Shared file systems (manila)"
 msgstr ""

-#: ./doc/common/app_support.xml:341(link)
+#: ./doc/common/app_support.xml:346(link)
 msgid "Bugs: Telemetry (ceilometer)"
 msgstr ""

-#: ./doc/common/app_support.xml:346(link)
+#: ./doc/common/app_support.xml:351(link)
 msgid "Bugs: Telemetry v3 (gnocchi)"
 msgstr ""

-#: ./doc/common/app_support.xml:351(link)
+#: ./doc/common/app_support.xml:356(link)
 msgid "Bugs: Workflow service (mistral)"
 msgstr ""

-#: ./doc/common/app_support.xml:356(link)
+#: ./doc/common/app_support.xml:361(link)
 msgid "Bugs: Message Service (zaqar)"
 msgstr ""

-#: ./doc/common/app_support.xml:362(link)
+#: ./doc/common/app_support.xml:367(link)
 msgid "Bugs: OpenStack API Documentation (developer.openstack.org)"
 msgstr ""

-#: ./doc/common/app_support.xml:368(link)
+#: ./doc/common/app_support.xml:373(link)
 msgid "Bugs: OpenStack Documentation (docs.openstack.org)"
 msgstr ""

-#: ./doc/common/app_support.xml:374(title)
+#: ./doc/common/app_support.xml:379(title)
 msgid "The OpenStack IRC channel"
 msgstr ""

-#: ./doc/common/app_support.xml:375(para)
+#: ./doc/common/app_support.xml:380(para)
 msgid "The OpenStack community lives in the #openstack IRC channel on the Freenode network. You can hang out, ask questions, or get immediate feedback for urgent and pressing issues. To install an IRC client or use a browser-based client, go to <link xlink:href=\"https://webchat.freenode.net\">https://webchat.freenode.net/</link>. You can also use Colloquy (Mac OS X, <link xlink:href=\"http://colloquy.info/\">http://colloquy.info/</link>), mIRC (Windows, <link xlink:href=\"http://www.mirc.com/\">http://www.mirc.com/</link>), or XChat (Linux). When you are in the IRC channel and want to share code or command output, the generally accepted method is to use a Paste Bin. The OpenStack project has one at <link xlink:href=\"http://paste.openstack.org\">http://paste.openstack.org</link>. Just paste your longer amounts of text or logs in the web form and you get a URL that you can paste into the channel. The OpenStack IRC channel is <literal>#openstack</literal> on <literal>irc.freenode.net</literal>. You can find a list of all OpenStack IRC channels at <link xlink:href=\"https://wiki.openstack.org/wiki/IRC\">https://wiki.openstack.org/wiki/IRC</link>."
 msgstr ""

-#: ./doc/common/app_support.xml:398(title)
+#: ./doc/common/app_support.xml:403(title)
 msgid "Documentation feedback"
 msgstr ""

-#: ./doc/common/app_support.xml:405(title)
+#: ./doc/common/app_support.xml:410(title)
 msgid "OpenStack distribution packages"
 msgstr ""

-#: ./doc/common/app_support.xml:406(para)
+#: ./doc/common/app_support.xml:411(para)
 msgid "The following Linux distributions provide community-supported packages for OpenStack:"
 msgstr ""

-#: ./doc/common/app_support.xml:410(emphasis)
+#: ./doc/common/app_support.xml:415(emphasis)
 msgid "Debian:"
 msgstr ""

-#: ./doc/common/app_support.xml:413(link)
+#: ./doc/common/app_support.xml:418(link)
 msgid "https://wiki.debian.org/OpenStack"
 msgstr ""

-#: ./doc/common/app_support.xml:416(emphasis)
+#: ./doc/common/app_support.xml:421(emphasis)
 msgid "CentOS, Fedora, and Red Hat Enterprise Linux:"
 msgstr ""

-#: ./doc/common/app_support.xml:419(link)
+#: ./doc/common/app_support.xml:424(link)
 msgid "https://www.rdoproject.org/"
 msgstr ""

-#: ./doc/common/app_support.xml:422(emphasis)
+#: ./doc/common/app_support.xml:427(emphasis)
 msgid "openSUSE and SUSE Linux Enterprise Server:"
 msgstr ""

-#: ./doc/common/app_support.xml:426(link)
+#: ./doc/common/app_support.xml:431(link)
 msgid "https://en.opensuse.org/Portal:OpenStack"
 msgstr ""

-#: ./doc/common/app_support.xml:429(emphasis)
+#: ./doc/common/app_support.xml:434(emphasis)
 msgid "Ubuntu:"
 msgstr ""

-#: ./doc/common/app_support.xml:432(link)
+#: ./doc/common/app_support.xml:437(link)
 msgid "https://wiki.ubuntu.com/ServerTeam/CloudArchive"
 msgstr ""

@ -1595,214 +1603,226 @@ msgid "Creates and manages volumes."
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:60(td)
-msgid "Compute"
+msgid "Clustering service"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:62(package)
-msgid "python-novaclient"
+msgid "python-senlinclient"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:63(td)
-msgid "Creates and manages images, instances, and flavors."
+msgid "Creates and manages clustering services."
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:66(td)
-msgid "Containers service"
+msgid "Compute"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:68(package)
-msgid "python-magnumclient"
+msgid "python-novaclient"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:69(td)
-msgid "Creates and manages containers."
+msgid "Creates and manages images, instances, and flavors."
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:72(td)
-msgid "Database service"
+msgid "Containers service"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:74(package)
-msgid "python-troveclient"
+msgid "python-magnumclient"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:75(td)
-msgid "Creates and manages databases."
+msgid "Creates and manages containers."
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:78(td)
-msgid "Data processing service"
+msgid "Database service"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:80(package)
-msgid "python-saharaclient"
+msgid "python-troveclient"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:81(td)
-msgid "Creates and manages Hadoop clusters on OpenStack."
+msgid "Creates and manages databases."
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:84(td)
-msgid "Deployment service"
+msgid "Data processing service"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:86(package)
-msgid "python-tuskarclient"
+msgid "python-saharaclient"
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:87(td)
-msgid "Plans Deployments."
+msgid "Creates and manages Hadoop clusters on OpenStack."
 msgstr ""

 #: ./doc/common/section_cli_overview.xml:90(td)
+msgid "Deployment service"
+msgstr ""
+
+#: ./doc/common/section_cli_overview.xml:92(package)
+msgid "python-tuskarclient"
+msgstr ""
+
+#: ./doc/common/section_cli_overview.xml:93(td)
+msgid "Plans Deployments."
+msgstr ""
+
+#: ./doc/common/section_cli_overview.xml:96(td)
 msgid "Identity"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:92(package) ./doc/common/section_cli_overview.xml:168(package)
+#: ./doc/common/section_cli_overview.xml:98(package) ./doc/common/section_cli_overview.xml:174(package)
 msgid "python-openstackclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:93(td)
+#: ./doc/common/section_cli_overview.xml:99(td)
 msgid "Creates and manages users, tenants, roles, endpoints, and credentials."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:96(td)
+#: ./doc/common/section_cli_overview.xml:102(td)
 msgid "Image service"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:98(package)
+#: ./doc/common/section_cli_overview.xml:104(package)
 msgid "python-glanceclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:99(td)
+#: ./doc/common/section_cli_overview.xml:105(td)
 msgid "Creates and manages images."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:102(td)
+#: ./doc/common/section_cli_overview.xml:108(td)
 msgid "Key Manager service"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:104(package)
+#: ./doc/common/section_cli_overview.xml:110(package)
 msgid "python-barbicanclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:105(td)
+#: ./doc/common/section_cli_overview.xml:111(td)
 msgid "Creates and manages keys."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:108(td)
+#: ./doc/common/section_cli_overview.xml:114(td)
 msgid "Monitoring"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:110(package)
+#: ./doc/common/section_cli_overview.xml:116(package)
 msgid "python-monascaclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:111(td)
+#: ./doc/common/section_cli_overview.xml:117(td)
 msgid "Monitoring solution."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:114(td)
+#: ./doc/common/section_cli_overview.xml:120(td)
 msgid "Networking"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:116(package)
+#: ./doc/common/section_cli_overview.xml:122(package)
 msgid "python-neutronclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:117(td)
+#: ./doc/common/section_cli_overview.xml:123(td)
 msgid "Configures networks for guest servers. This client was previously called <placeholder-1/>."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:121(td)
+#: ./doc/common/section_cli_overview.xml:127(td)
 msgid "Object Storage"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:123(package)
+#: ./doc/common/section_cli_overview.xml:129(package)
 msgid "python-swiftclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:124(td)
+#: ./doc/common/section_cli_overview.xml:130(td)
 msgid "Gathers statistics, lists items, updates metadata, and uploads, downloads, and deletes files stored by the Object Storage service. Gains access to an Object Storage installation for ad hoc processing."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:129(td)
+#: ./doc/common/section_cli_overview.xml:135(td)
 msgid "Orchestration"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:131(package)
+#: ./doc/common/section_cli_overview.xml:137(package)
 msgid "python-heatclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:132(td)
+#: ./doc/common/section_cli_overview.xml:138(td)
 msgid "Launches stacks from templates, views details of running stacks including events and resources, and updates and deletes stacks."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:136(td)
+#: ./doc/common/section_cli_overview.xml:142(td)
 msgid "Rating service"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:138(package)
+#: ./doc/common/section_cli_overview.xml:144(package)
 msgid "python-cloudkittyclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:139(td)
+#: ./doc/common/section_cli_overview.xml:145(td)
 msgid "Rating service."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:142(td)
+#: ./doc/common/section_cli_overview.xml:148(td)
 msgid "Shared file systems"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:144(package)
+#: ./doc/common/section_cli_overview.xml:150(package)
 msgid "python-manilaclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:145(td)
+#: ./doc/common/section_cli_overview.xml:151(td)
 msgid "Creates and manages shared file systems."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:148(td)
+#: ./doc/common/section_cli_overview.xml:154(td)
 msgid "Telemetry"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:150(package)
+#: ./doc/common/section_cli_overview.xml:156(package)
 msgid "python-ceilometerclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:151(td) ./doc/common/section_cli_overview.xml:157(td)
+#: ./doc/common/section_cli_overview.xml:157(td) ./doc/common/section_cli_overview.xml:163(td)
 msgid "Creates and collects measurements across OpenStack."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:154(td)
+#: ./doc/common/section_cli_overview.xml:160(td)
 msgid "Telemetry v3"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:156(package)
+#: ./doc/common/section_cli_overview.xml:162(package)
 msgid "python-gnocchiclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:160(td)
+#: ./doc/common/section_cli_overview.xml:166(td)
 msgid "Workflow service"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:162(package)
+#: ./doc/common/section_cli_overview.xml:168(package)
 msgid "python-mistralclient"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:163(td)
+#: ./doc/common/section_cli_overview.xml:169(td)
 msgid "Workflow service for OpenStack cloud."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:166(td)
+#: ./doc/common/section_cli_overview.xml:172(td)
 msgid "Common client"
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:169(td)
+#: ./doc/common/section_cli_overview.xml:175(td)
 msgid "Common client for the OpenStack project."
 msgstr ""

-#: ./doc/common/section_cli_overview.xml:173(para)
+#: ./doc/common/section_cli_overview.xml:179(para)
 msgid "For client installation instructions, see <link xlink:href=\"http://docs.openstack.org/user-guide/common/cli_install_openstack_command_line_clients.html\">Install the OpenStack command-line clients</link>. For information about the OpenStack RC file, see <link xlink:href=\"http://docs.openstack.org/user-guide/common/cli_set_environment_variables_using_openstack_rc.html\">Download and source the OpenStack RC file</link>."
 msgstr ""

--- a/doc/image-guide/source/locale/image-guide.pot
+++ b/doc/image-guide/source/locale/image-guide.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Virtual Machine Image Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-28 06:08+0000\n"
+"POT-Creation-Date: 2015-12-11 06:14+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"
@ -72,10 +72,10 @@ msgstr ""

 #: ../centos-image.rst:29
 msgid ""
-"Start the installation process using either :command:`virt-manager` or :"
-"command:`virt-install` as described in the previous section. If you use :"
-"command:`virt-install`, do not forget to connect your VNC client to the "
-"virtual machine."
+"Start the installation process using either the :command:`virt-manager` or "
+"the :command:`virt-install` command as described in the previous section. If "
+"you use the :command:`virt-install` command, do not forget to connect your "
+"VNC client to the virtual machine."
 msgstr ""

 #: ../centos-image.rst:34
@ -94,8 +94,8 @@ msgstr ""

 #: ../centos-image.rst:41
 msgid ""
-"If you use :command:`virt-install`, the commands should look something like "
-"this:"
+"If you use the :command:`virt-install` command, the commands should look "
+"something like this:"
 msgstr ""

 #: ../centos-image.rst:56 ../centos-image.rst:134
@ -115,8 +115,8 @@ msgstr ""

 #: ../centos-image.rst:68
 msgid ""
-"The default TCP/IP settings are fine. In particular, ensure that Enable IPv4 "
-"support is enabled with DHCP, which is the default."
+"The default TCP/IP settings are fine. In particular, ensure that ``Enable "
+"IPv4 support`` is enabled with DHCP, which is the default."
 msgstr ""

 #: ../centos-image.rst:76
@ -288,8 +288,8 @@ msgstr ""

 #: ../centos-image.rst:215
 msgid ""
-"Modify ``/etc/rc.local`` to fetch desired information from the metadata "
-"service, as described in the next section."
+"Modify the ``/etc/rc.local`` file to fetch desired information from the "
+"metadata service, as described in the next section."
 msgstr ""

 # #-#-#-#-#  centos-image.pot (Virtual Machine Image Guide 0.9)  #-#-#-#-#
@ -305,7 +305,9 @@ msgid ""
 "init`` inside the CentOS guest by adding the EPEL repo:"
 msgstr ""

-#: ../centos-image.rst:231
+# #-#-#-#-#  centos-image.pot (Virtual Machine Image Guide 0.9)  #-#-#-#-#
+# #-#-#-#-#  ubuntu-image.pot (Virtual Machine Image Guide 0.9)  #-#-#-#-#
+#: ../centos-image.rst:231 ../ubuntu-image.rst:196
 msgid ""
 "The account varies by distribution. On Ubuntu-based virtual machines, the "
 "account is called ``ubuntu``. On Fedora-based virtual machines, the account "
@ -438,9 +440,9 @@ msgstr ""

 #: ../centos-image.rst:365
 msgid ""
-"The underlying image file that you created with :command:`qemu-img create` "
-"is ready to be uploaded. For example, you can upload the ``/tmp/centos-6.4."
-"qcow2`` image to the Image service."
+"The underlying image file that you created with the :command:`qemu-img "
+"create` command is ready to be uploaded. For example, you can upload the ``/"
+"tmp/centos-6.4.qcow2`` image to the Image service."
 msgstr ""

 #: ../convert-images.rst:0
@ -493,7 +495,7 @@ msgstr ""

 # #-#-#-#-#  convert-images.pot (Virtual Machine Image Guide 0.9)  #-#-#-#-#
 # #-#-#-#-#  image-formats.pot (Virtual Machine Image Guide 0.9)  #-#-#-#-#
-#: ../convert-images.rst:23 ../image-formats.rst:19
+#: ../convert-images.rst:23 ../image-formats.rst:31
 msgid "raw"
 msgstr ""

@ -732,7 +734,7 @@ msgstr ""
 msgid ""
 "`VeeWee <https://github.com/jedi4ever/veewee>`_ is often used to build "
 "`Vagrant <http://vagrantup.com>`_ boxes, but it can also be used to build "
-"KVM images."
+"the KVM images."
 msgstr ""

 #: ../create-images-automatically.rst:166
@ -850,8 +852,8 @@ msgstr ""

 #: ../fedora-image.rst:125
 msgid ""
-"Run the following commands from the host to eject the disk and reboot using :"
-"command:`virsh`, as root."
+"Run the following commands from the host to eject the disk and reboot using "
+"the :command:`virsh` command, as root."
 msgstr ""

 #: ../fedora-image.rst:134
@ -879,8 +881,8 @@ msgstr ""

 #: ../fedora-image.rst:150
 msgid ""
-"Install ``cloud-init`` package inside the Fedora guest by adding the EPEL "
-"repo:"
+"Install the ``cloud-init`` package inside the Fedora guest by adding the "
+"EPEL repo:"
 msgstr ""

 #: ../fedora-image.rst:153
@ -933,8 +935,8 @@ msgstr ""

 #: ../fedora-image.rst:218
 msgid ""
-"The underlying image file that you created with :command:`qemu-img create` "
-"is ready to be uploaded to the Image service."
+"The underlying image file that you created with the :command:`qemu-img "
+"create` command is ready to be uploaded to the Image service."
 msgstr ""

 #: ../freebsd-image.rst:3
@ -1146,7 +1148,7 @@ msgstr ""

 #: ../freebsd-image.rst:154
 msgid ""
-"From the list of services to start on boot, you must select ``ssh``. "
+"From the list of services to start on boot, you must select :guilabel:`ssh`. "
 "Optionally, select other services."
 msgstr ""

@ -1260,79 +1262,79 @@ msgstr ""
 msgid "Set the disk format for your image to one of the following values:"
 msgstr ""

-#: ../image-formats.rst:19
-msgid ""
-"An unstructured disk image format; if you have a file without an extension "
-"it is possibly a raw format."
-msgstr ""
-
-#: ../image-formats.rst:22
-msgid ""
-"The VHD disk format, a common disk format used by virtual machine monitors "
-"from VMware, Xen, Microsoft, VirtualBox, and others."
+#: ../image-formats.rst:18 ../image-formats.rst:56
+msgid "aki"
 msgstr ""

-#: ../image-formats.rst:22
-msgid "vhd"
+#: ../image-formats.rst:19 ../image-formats.rst:57
+msgid "An Amazon kernel image."
 msgstr ""

-#: ../image-formats.rst:24
-msgid "vmdk"
+#: ../image-formats.rst:20 ../image-formats.rst:58
+msgid "ami"
 msgstr ""

-#: ../image-formats.rst:25
-msgid "Common disk format supported by many common virtual machine monitors."
+#: ../image-formats.rst:21 ../image-formats.rst:59
+msgid "An Amazon machine image."
 msgstr ""

-#: ../image-formats.rst:26
-msgid "vdi"
+#: ../image-formats.rst:22 ../image-formats.rst:60
+msgid "ari"
 msgstr ""

-#: ../image-formats.rst:27
-msgid "Supported by VirtualBox virtual machine monitor and the QEMU emulator."
+#: ../image-formats.rst:23 ../image-formats.rst:61
+msgid "An Amazon ramdisk image."
 msgstr ""

-#: ../image-formats.rst:29
+#: ../image-formats.rst:25
 msgid ""
 "An archive format for the data contents of an optical disc, such as CD-ROM."
 msgstr ""

-#: ../image-formats.rst:29
+#: ../image-formats.rst:25
 msgid "iso"
 msgstr ""

-#: ../image-formats.rst:32
+#: ../image-formats.rst:28
 msgid ""
 "Supported by the QEMU emulator that can expand dynamically and supports Copy "
 "on Write."
 msgstr ""

-#: ../image-formats.rst:32
+#: ../image-formats.rst:28
 msgid "qcow2"
 msgstr ""

-#: ../image-formats.rst:34 ../image-formats.rst:60
-msgid "aki"
+#: ../image-formats.rst:31
+msgid ""
+"An unstructured disk image format; if you have a file without an extension "
+"it is possibly a raw format."
 msgstr ""

-#: ../image-formats.rst:35 ../image-formats.rst:61
-msgid "An Amazon kernel image."
+#: ../image-formats.rst:33
+msgid "vdi"
 msgstr ""

-#: ../image-formats.rst:36 ../image-formats.rst:62
-msgid "ari"
+#: ../image-formats.rst:34
+msgid "Supported by VirtualBox virtual machine monitor and the QEMU emulator."
 msgstr ""

-#: ../image-formats.rst:37 ../image-formats.rst:63
-msgid "An Amazon ramdisk image."
+#: ../image-formats.rst:36
+msgid ""
+"The VHD disk format, a common disk format used by virtual machine monitors "
+"from VMware, Xen, Microsoft, VirtualBox, and others."
 msgstr ""

-#: ../image-formats.rst:39 ../image-formats.rst:65
-msgid "An Amazon machine image."
+#: ../image-formats.rst:36
+msgid "vhd"
 msgstr ""

-#: ../image-formats.rst:39 ../image-formats.rst:64
-msgid "ami"
+#: ../image-formats.rst:39
+msgid "Common disk format supported by many common virtual machine monitors."
+msgstr ""
+
+#: ../image-formats.rst:39
+msgid "vmdk"
 msgstr ""

 #: ../image-formats.rst:42
@ -1358,19 +1360,27 @@ msgid ""
 "values:"
 msgstr ""

-#: ../image-formats.rst:56
+#: ../image-formats.rst:62
 msgid "bare"
 msgstr ""

-#: ../image-formats.rst:57
+#: ../image-formats.rst:63
 msgid "The image does not have a container or metadata envelope."
 msgstr ""

-#: ../image-formats.rst:58
+#: ../image-formats.rst:64
+msgid "docker"
+msgstr ""
+
+#: ../image-formats.rst:65
+msgid "A docker container format."
+msgstr ""
+
+#: ../image-formats.rst:66
 msgid "ovf"
 msgstr ""

-#: ../image-formats.rst:59
+#: ../image-formats.rst:67
 msgid "The OVF container format."
 msgstr ""

@ -1402,8 +1412,9 @@ msgstr ""
 #: ../image-metadata.rst:20
 msgid ""
 "You can add metadata to Image service images by using the ``--property "
-"key=value`` parameter with the ``glance image-create`` or ``glance image-"
-"update`` command. More than one property can be specified. For example:"
+"key=value`` parameter with the :command:`glance image-create` or :command:"
+"`glance image-update` command. More than one property can be specified. For "
+"example:"
 msgstr ""

 #: ../image-metadata.rst:30
@ -1416,8 +1427,8 @@ msgstr ""

 #: ../image-metadata.rst:36
 msgid ""
-"All associated properties for an image can be displayed using the ``glance "
-"image-show`` command. For example:"
+"All associated properties for an image can be displayed using the :command:"
+"`glance image-show` command. For example:"
 msgstr ""

 #: ../image-metadata.rst:83
@ -1474,12 +1485,12 @@ msgstr ""

 #: ../introduction.rst:16
 msgid ""
-"To keep things brief, we will sometimes use the term image instead of "
+"To keep things brief, we will sometimes use the term ``image`` instead of "
 "virtual machine image."
 msgstr ""

 #: ../introduction.rst:19
-msgid "What is a virtual machine image?"
+msgid "**What is a virtual machine image?**"
 msgstr ""

 #: ../introduction.rst:21
@ -1499,7 +1510,7 @@ msgid ""
 "The ``raw`` image format is the simplest one, and is natively supported by "
 "both KVM and Xen hypervisors. You can think of a raw image as being the bit-"
 "equivalent of a block device file, created as if somebody had copied, say, "
-"``/dev/sda`` to a file using the ``dd`` command."
+"``/dev/sda`` to a file using the :command:`dd` command."
 msgstr ""

 #: ../introduction.rst:36
@ -1698,8 +1709,8 @@ msgstr ""
 #: ../modify-images.rst:11
 msgid ""
 "Do not attempt to use these tools to modify an image that is attached to a "
-"running virtual machine. These tools are designed only to modify images that "
-"are not currently running."
+"running virtual machine. These tools are designed only to modify the images "
+"that are not currently running."
 msgstr ""

 #: ../modify-images.rst:17
@ -1731,10 +1742,10 @@ msgid ""
 "Sometimes you must modify a virtual machine image to remove any traces of "
 "the MAC address that was assigned to the virtual network interface card when "
 "the image was first created. This is because the MAC address is different "
-"when the virtual machine images boots. This example shows how to use "
-"guestfish to remove references to the old MAC address by deleting the ``/etc/"
-"udev/rules.d/70-persistent-net.rules`` file and removing the ``HWADDR`` line "
-"from the ``/etc/sysconfig/network-scripts/ifcfg-eth0`` file."
+"when the virtual machine images boots. This example shows how to use the "
+"``guestfish`` to remove references to the old MAC address by deleting the ``/"
+"etc/udev/rules.d/70-persistent-net.rules`` file and removing the ``HWADDR`` "
+"line from the ``/etc/sysconfig/network-scripts/ifcfg-eth0`` file."
 msgstr ""

 #: ../modify-images.rst:45
@ -1941,8 +1952,9 @@ msgstr ""

 #: ../modify-images.rst:270
 msgid ""
-"If you do not have access to libguestfs, you can mount image file systems "
-"directly in the host using loop devices, kpartx, and network block devices."
+"If you do not have access to the libguestfs, you can mount image file "
+"systems directly in the host using loop devices, kpartx, and network block "
+"devices."
 msgstr ""

 #: ../modify-images.rst:276
@ -2004,66 +2016,68 @@ msgstr ""

 #: ../modify-images.rst:347
 msgid ""
-"If your partitions are managed with LVM, use losetup and kpartx as in the "
-"previous example to expose the partitions to the host."
+"If your partitions are managed with LVM, use :command:`losetup` and :command:"
+"`kpartx` commands as in the previous example to expose the partitions to the "
+"host."
 msgstr ""

 #: ../modify-images.rst:358
 msgid ""
 "Next, you need to use the :command:`vgscan` command to identify the LVM "
-"volume groups and then :command:`vgchange` to expose the volumes as devices:"
+"volume groups and then the :command:`vgchange` command to expose the volumes "
+"as devices:"
 msgstr ""

-#: ../modify-images.rst:370
+#: ../modify-images.rst:371
 msgid "Clean up when you are done:"
 msgstr ""

-#: ../modify-images.rst:380
+#: ../modify-images.rst:381
 msgid "Mount a qcow2 image (without LVM)"
 msgstr ""

-#: ../modify-images.rst:382
+#: ../modify-images.rst:383
 msgid ""
 "You need the ``nbd`` (network block device) kernel module loaded to mount "
 "qcow2 images. This will load it with support for 16 block devices, which is "
 "fine for our purposes. As root:"
 msgstr ""

-#: ../modify-images.rst:390
+#: ../modify-images.rst:391
 msgid ""
 "Assuming the first block device (``/dev/nbd0``) is not currently in use, we "
 "can expose the disk partitions using the :command:`qemu-nbd` and :command:"
 "`partprobe` commands. As root:"
 msgstr ""

-#: ../modify-images.rst:399
+#: ../modify-images.rst:400
 msgid ""
 "If the image has, say three partitions (/boot, /, swap), there should be one "
 "new device created for each partition:"
 msgstr ""

-#: ../modify-images.rst:412
+#: ../modify-images.rst:413
 msgid ""
-"If the network block device you selected was already in use, the initial "
-"``qemu-nbd`` command will fail silently, and the ``/dev/nbd3p{1,2,3}`` "
+"If the network block device you selected was already in use, the initial :"
+"command:`qemu-nbd` command will fail silently, and the ``/dev/nbd3p{1,2,3}`` "
 "device files will not be created."
 msgstr ""

-#: ../modify-images.rst:416
+#: ../modify-images.rst:417
 msgid ""
 "If the image partitions are not managed with LVM, they can be mounted "
 "directly:"
 msgstr ""

-#: ../modify-images.rst:424 ../modify-images.rst:452
+#: ../modify-images.rst:425 ../modify-images.rst:453
 msgid "When you are done, clean up:"
 msgstr ""

-#: ../modify-images.rst:433
+#: ../modify-images.rst:434
 msgid "Mount a qcow2 image (with LVM)"
 msgstr ""

-#: ../modify-images.rst:435
+#: ../modify-images.rst:436
 msgid ""
 "If the image partitions are managed with LVM, after you use :command:`qemu-"
 "nbd` and :command:`partprobe`, you must use :command:`vgscan` and :command:"
@ -2102,9 +2116,9 @@ msgstr ""
 msgid ""
 "The simplest way to obtain a virtual machine image that works with OpenStack "
 "is to download one that someone else has already created. Most of the images "
-"contain the ``cloud-init`` package to support SSH key pair and user data "
+"contain the ``cloud-init`` package to support the SSH key pair and user data "
 "injection. Because many of the images disable SSH password authentication by "
-"default, boot the image with an injected key pair. You can SSH into the "
+"default, boot the image with an injected key pair. You can ``SSH`` into the "
 "instance with the private key and default login account. See the `OpenStack "
 "End User Guide <http://docs.openstack.org/user-guide>`_ for more information "
 "on how to create and inject key pairs with OpenStack."
@ -2162,7 +2176,7 @@ msgstr ""

 #: ../obtain-images.rst:49
 msgid ""
-"Canonical maintains an `official set of Ubuntu-based images <http://cloud-"
+"Canonical maintains an official set of `Ubuntu-based images <http://cloud-"
 "images.ubuntu.com/>`_."
 msgstr ""

@ -2172,7 +2186,7 @@ msgid ""
 "``current`` being the most recent. For example, the page that contains the "
 "most recently built image for Ubuntu 14.04 Trusty Tahr is http://cloud-"
 "images.ubuntu.com/trusty/current/. Scroll to the bottom of the page for "
-"links to images that can be downloaded directly."
+"links to the images that can be downloaded directly."
 msgstr ""

 #: ../obtain-images.rst:59
@ -2236,7 +2250,7 @@ msgid ""
 "SUSE provides images for `openSUSE <http://download.opensuse.org/"
 "repositories/Cloud:/Images:/>`_. For SUSE Linux Enterprise Server (SLES), "
 "custom images can be built with a web-based tool called `SUSE Studio <http://"
-"susestudio.com>`_. SUSE Studio can also be used to build custom openSUSE "
+"susestudio.com>`_. SUSE Studio can also be used to build the custom openSUSE "
 "images."
 msgstr ""

@ -2590,9 +2604,9 @@ msgstr ""

 #: ../openstack-images.rst:157
 msgid ""
-"If you delete the network persistent rules files, you may get a udev kernel "
-"warning at boot time, which is why we recommend replacing them with empty "
-"files instead."
+"If you delete the network persistent rules files, you may get a ``udev "
+"kernel`` warning at boot time, which is why we recommend replacing them with "
+"empty files instead."
 msgstr ""

 #: ../openstack-images.rst:162
@ -2665,8 +2679,8 @@ msgstr ""
 #: ../openstack-images.rst:219
 msgid ""
 "To fetch the ssh public key and add it to the root account, edit the ``/etc/"
-"rc.local`` file and add the following lines before the line \"touch /var/"
-"lock/subsys/local\". This code fragment is taken from the `rackerjoe oz-"
+"rc.local`` file and add the following lines before the line ``touch /var/"
+"lock/subsys/local``. This code fragment is taken from the `rackerjoe oz-"
 "image-build CentOS 6 template <https://github.com/ rackerjoe/oz-image-build/"
 "blob/master/templates/centos60_x86_64.tdl>`_."
 msgstr ""
@ -2701,7 +2715,7 @@ msgid ""
 "compatible with version 2009-04-04 of the Amazon EC2 metadata service, "
 "consult the Amazon EC2 documentation on `Using Instance Metadata <http://"
 "docs.amazonwebservices.com/ AWSEC2/2009-04-04/UserGuide/AESDG-chapter-"
-"instancedata.html>`_ for details on how to retrieve user data."
+"instancedata.html>`_ for details on how to retrieve the user data."
 msgstr ""

 #: ../openstack-images.rst:289
@ -2724,22 +2738,23 @@ msgstr ""

 #: ../openstack-images.rst:303
 msgid ""
-"If your image uses grub2 as the boot loader, there should be a line in the "
-"grub configuration file. For example, ``/boot/grub/grub.cfg``, which looks "
-"something like this:"
+"If your image uses ``grub2`` as the boot loader, there should be a line in "
+"the grub configuration file. For example, ``/boot/grub/grub.cfg``, which "
+"looks something like this:"
 msgstr ""

 #: ../openstack-images.rst:311
 msgid ""
 "If ``console=ttyS0`` does not appear, you must modify your grub "
 "configuration. In general, you should not update the ``grub.cfg`` directly, "
-"since it is automatically generated. Instead, you should edit ``/etc/default/"
-"grub`` and modify the value of the ``GRUB_CMDLINE_LINUX_DEFAULT`` variable:"
+"since it is automatically generated. Instead, you should edit the ``/etc/"
+"default/grub`` file and modify the value of the "
+"``GRUB_CMDLINE_LINUX_DEFAULT`` variable:"
 msgstr ""

 #: ../openstack-images.rst:321
 msgid ""
-"Next, update the grub configuration. On Debian-based operating-systems such "
+"Next, update the grub configuration. On Debian-based operating systems such "
 "as Ubuntu, run this command:"
 msgstr ""

@ -2769,15 +2784,15 @@ msgstr ""

 #: ../openstack-images.rst:349
 msgid ""
-"Use options in ``nova.conf`` to control whether, and for how long, unused "
-"base images are stored in ``/var/lib/nova/instances/_base/``. If you have "
-"configured live migration of instances, all your compute nodes share one "
-"common ``/var/lib/nova/instances/`` directory."
+"Use options in the ``nova.conf`` file to control whether, and for how long, "
+"unused base images are stored in the ``/var/lib/nova/instances/_base/``. If "
+"you have configured live migration of instances, all your compute nodes "
+"share one common ``/var/lib/nova/instances/`` directory."
 msgstr ""

 #: ../openstack-images.rst:354
 msgid ""
-"For information about libvirt images in OpenStack, see `The life of an "
+"For information about the libvirt images in OpenStack, see `The life of an "
 "OpenStack libvirt image from Pádraig Brady <http://www.pixelbeat.org/docs/"
 "openstack_libvirt_images/>`_."
 msgstr ""
@ -2865,8 +2880,8 @@ msgid ""
 "Because 86400 seconds (24 hours) is the default time for "
 "``remove_unused_original_minimum_age_seconds``, you can either wait for that "
 "time interval to see the base image removed, or set the value to a shorter "
-"time period in ``nova.conf``. Restart all nova services after changing a "
-"setting in ``nova.conf``."
+"time period in the ``nova.conf`` file. Restart all nova services after "
+"changing a setting in the ``nova.conf`` file."
 msgstr ""

 #: ../ubuntu-image.rst:3
@ -2981,8 +2996,8 @@ msgstr ""

 #: ../ubuntu-image.rst:93
 msgid ""
-"Choose ``OpenSSH server`` so that you will be able to SSH into the virtual "
-"machine when it launches inside of an OpenStack cloud."
+"Choose :guilabel:`OpenSSH server` so that you will be able to SSH into the "
+"virtual machine when it launches inside of an OpenStack cloud."
 msgstr ""

 #: ../ubuntu-image.rst:99
@ -2991,8 +3006,8 @@ msgstr ""

 #: ../ubuntu-image.rst:101
 msgid ""
-"Select \"Yes\" when asked about installing the GRUB boot loader to the "
-"master boot record."
+"Select :guilabel:`Yes` when asked about installing the GRUB boot loader to "
+"the master boot record."
 msgstr ""

 #: ../ubuntu-image.rst:107
@ -3024,8 +3039,8 @@ msgstr ""
 #: ../ubuntu-image.rst:145
 msgid ""
 "Run the following commands in the host as root to start up the machine again "
-"as paused, eject the disk and resume. If you are using virt-manager, you may "
-"use the GUI instead."
+"as paused, eject the disk and resume. If you are using ``virt-manager``, you "
+"may use the GUI instead."
 msgstr ""

 #: ../ubuntu-image.rst:157
@ -3040,8 +3055,8 @@ msgstr ""
 #: ../ubuntu-image.rst:166
 msgid ""
 "When you boot for the first time after install, it may ask you about "
-"authentication tools, you can just choose ``Exit``. Then, log in as root "
-"using the root password you specified."
+"authentication tools, you can just choose :guilabel:`Exit`. Then, log in as "
+"root using the root password you specified."
 msgstr ""

 #: ../ubuntu-image.rst:171
@ -3070,14 +3085,7 @@ msgstr ""
 msgid ""
 "To set the metadata source to be used by the image run the :command:`dpkg-"
 "reconfigure` command against the ``cloud-init`` package. When prompted "
-"select the ``EC2`` data source:"
-msgstr ""
-
-#: ../ubuntu-image.rst:196
-msgid ""
-"The account varies by distribution. On Ubuntu-based virtual machines, the "
-"account is called \"ubuntu\". On Fedora-based virtual machines, the account "
-"is called \"ec2-user\"."
+"select the :guilabel:`EC2` data source:"
 msgstr ""

 #: ../ubuntu-image.rst:200
@ -3106,9 +3114,9 @@ msgstr ""

 #: ../ubuntu-image.rst:249
 msgid ""
-"The underlying image file that you created with :command:`qemu-img create`, "
-"such as ``/tmp/trusty.qcow2``, is now ready for uploading to the Image "
-"service."
+"The underlying image file that you created with the :command:`qemu-img "
+"create` command, such as ``/tmp/trusty.qcow2``, is now ready for uploading "
+"to the Image service."
 msgstr ""

 #: ../virt-install.rst:3
@ -3223,20 +3231,21 @@ msgstr ""

 #: ../virt-manager.rst:36
 msgid ""
-"Click the ``New`` button at the top-left and step through the instructions."
+"Click the :guilabel:`New` button at the top-left and step through the "
+"instructions."
 msgstr ""

-#: ../virt-manager.rst:41
+#: ../virt-manager.rst:42
 msgid ""
 "You will be shown a series of dialog boxes that will allow you to specify "
 "information about the virtual machine."
 msgstr ""

-#: ../virt-manager.rst:46
+#: ../virt-manager.rst:47
 msgid ""
 "When using qcow2 format images you should check the option ``customize "
-"before install``, go to disk properties and explicitly select the qcow2 "
-"format. This ensures the virtual machine disk size will be correct."
+"before install``, go to disk properties and explicitly select the :guilabel:"
+"`qcow2` format. This ensures the virtual machine disk size will be correct."
 msgstr ""

 #: ../windows-image.rst:3
@ -3245,8 +3254,8 @@ msgstr ""

 #: ../windows-image.rst:5
 msgid ""
-"This example creates a Windows Server 2012 qcow2 image, using :command:`virt-"
-"install` and the KVM hypervisor."
+"This example creates a Windows Server 2012 qcow2 image, using the :command:"
+"`virt-install` command and the KVM hypervisor."
 msgstr ""

 #: ../windows-image.rst:8
@ -3291,8 +3300,8 @@ msgid ""
 "The disk is not detected by default by the Windows installer. When requested "
 "to choose an installation target, click :guilabel:`Load driver` and browse "
 "the file system to select the ``E:\\WIN8\\AMD64`` folder. The Windows "
-"installer displays a list of drivers to install. Select the VirtIO SCSI and "
-"network drivers, and continue the installation."
+"installer displays a list of drivers to install. Select the :guilabel:"
+"`VirtIO SCSI` and :guilabel:`network drivers`, and continue the installation."
 msgstr ""

 #: ../windows-image.rst:48
@ -3312,12 +3321,12 @@ msgstr ""

 #: ../windows-image.rst:60
 msgid ""
-"To allow :term:`Cloudbase-Init` to run scripts during an instance boot, set "
-"the PowerShell execution policy to be unrestricted:"
+"To allow the :term:`Cloudbase-Init` to run scripts during an instance boot, "
+"set the PowerShell execution policy to be unrestricted:"
 msgstr ""

 #: ../windows-image.rst:68
-msgid "Download and install Cloudbase-Init:"
+msgid "Download and install the ``Cloudbase-Init``:"
 msgstr ""

 #: ../windows-image.rst:75
--- a/doc/image-guide/source/locale/ja/LC_MESSAGES/image-guide.po
+++ b/doc/image-guide/source/locale/ja/LC_MESSAGES/image-guide.po
@ -4,11 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Virtual Machine Image Guide 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-01 02:03+0000\n"
+"POT-Creation-Date: 2015-12-11 04:02+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2015-11-30 05:13+0000\n"
+"PO-Revision-Date: 2015-12-10 05:38+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@ -50,6 +50,9 @@ msgstr "**FreeBSD イメージの作成方法**"
 msgid "**Volume-from-Image properties**"
 msgstr "**Volume-from-Image プロパティ**"

+msgid "**What is a virtual machine image?**"
+msgstr "**仮想マシンイメージとは何でしょうか?**"
+
 msgid ":ref:`search`"
 msgstr ":ref:`search`"

@ -60,6 +63,9 @@ msgstr ""
 "UEC (Ubuntu Enterprise Cloud) ファイルは、AMI ファイル、AKI ファイル、ARI "
 "ファイルを含む、gzip された tar ファイルです。"

+msgid "A docker container format."
+msgstr "docker コンテナーフォーマット"
+
 msgid ""
 "A full treatment of Oz is beyond the scope of this document, but we will "
 "provide an example. You can find additional examples of Oz template files on "
@ -135,11 +141,11 @@ msgstr ""
 "を選択して、いくつかの OpenStack 固有の変更を実行します。"

 msgid ""
-"All associated properties for an image can be displayed using the ``glance "
-"image-show`` command. For example:"
+"All associated properties for an image can be displayed using the :command:"
+"`glance image-show` command. For example:"
 msgstr ""
-"すべての関連するイメージのプロパティーは、``glance image-show`` コマンドを使"
-"用して表示できます。例:"
+"すべての関連するイメージのプロパティーは、 :command:`glance image-show` コマ"
+"ンドを使用して表示できます。例:"

 msgid "An Amazon kernel image."
 msgstr "Amazon カーネルイメージ。"
@ -280,13 +286,14 @@ msgid ""
 "Because 86400 seconds (24 hours) is the default time for "
 "``remove_unused_original_minimum_age_seconds``, you can either wait for that "
 "time interval to see the base image removed, or set the value to a shorter "
-"time period in ``nova.conf``. Restart all nova services after changing a "
-"setting in ``nova.conf``."
+"time period in the ``nova.conf`` file. Restart all nova services after "
+"changing a setting in the ``nova.conf`` file."
 msgstr ""
 "``remove_unused_original_minimum_age_seconds`` のデフォルト時間は 86400 秒 "
 "(24 時間) なので、ベースイメージが削除されたことを確認するために、その時間待"
-"つことができます。または、 ``nova.conf`` により短い時間を設定します。 ``nova."
-"conf`` の設定を変更した後、すべての nova サービスを再起動してください。"
+"つことができます。または、 ``nova.conf`` ファイルにより短い時間を設定しま"
+"す。 ``nova.conf`` ファイルの設定を変更した後、すべての nova サービスを再起動"
+"してください。"

 msgid ""
 "Because VNC is a standard protocol, there are multiple clients available "
@ -375,7 +382,7 @@ msgstr ""
 "生する可能性があります。"

 msgid ""
-"Canonical maintains an `official set of Ubuntu-based images <http://cloud-"
+"Canonical maintains an official set of `Ubuntu-based images <http://cloud-"
 "images.ubuntu.com/>`_."
 msgstr ""
 "Canonical は `Ubuntu ベースの公式イメージ <http://cloud-images.ubuntu.com/"
@ -387,15 +394,15 @@ msgstr "CentOS ディレクトリー: ``centos/6/os/x86_64``"
 msgid "CentOS images"
 msgstr "CentOS イメージ"

-msgid "Choose URL as the installation method."
-msgstr "インストール方法として URL を選択します。"
-
 msgid ""
-"Choose ``OpenSSH server`` so that you will be able to SSH into the virtual "
-"machine when it launches inside of an OpenStack cloud."
+"Choose :guilabel:`OpenSSH server` so that you will be able to SSH into the "
+"virtual machine when it launches inside of an OpenStack cloud."
 msgstr ""
-"``OpenSSH server`` を選択して、OpenStack クラウド内での起動時に、仮想マシン"
-"に SSH ログインできるようにします。"
+":guilabel:`OpenSSH server` を選択して、OpenStack クラウド内での起動時に、仮想"
+"マシンに SSH ログインできるようにします。"
+
+msgid "Choose URL as the installation method."
+msgstr "インストール方法として URL を選択します。"

 msgid "Choose the VNC or text mode to set the installation options."
 msgstr ""
@ -431,8 +438,10 @@ msgid ""
 msgstr "ミラーの右側にある ``HTTP`` リンクをクリックします。"

 msgid ""
-"Click the ``New`` button at the top-left and step through the instructions."
-msgstr "画面左上にある ``New`` ボタンをクリックし、指示にしたがって進めます。"
+"Click the :guilabel:`New` button at the top-left and step through the "
+"instructions."
+msgstr ""
+"画面左上にある :guilabel:`New` ボタンをクリックし、指示にしたがって進めます。"

 msgid "Click the ``isos/`` folder link."
 msgstr "``isos/`` フォルダーへのリンクをクリックします。"
@ -632,8 +641,8 @@ msgstr "Diskimage-builder"

 msgid ""
 "Do not attempt to use these tools to modify an image that is attached to a "