Imported Translations from Transifex

For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: I7163d7e5168c02fdd36ec8f3ceef132b6a0bc993
2015-07-15 06:16:55 +00:00
parent 83f4fa820c
commit aac2ec4304
7 changed files with 1300 additions and 856 deletions
--- a/doc/common-rst/source/locale/common-rst.pot
+++ b/doc/common-rst/source/locale/common-rst.pot
@@ -503,6 +503,13 @@ msgid ""
 "a complete report of the service's current state, and is sent to ``stderr``."
 msgstr ""
 #: ../common/support-compute.rst:49
 msgid ""
 "A Guru Meditation report is sent by the Compute service upon receipt of the "
 "``SIGUSR1`` signal. This report is a general-purpose error report, including "
 "a complete report of the service's current state, and is sent to ``stderr``."
 msgstr ""
 #: ../common/glossary.rst:220
 msgid "A Java program that can be embedded into a web page."
 msgstr ""
@@ -1142,6 +1149,14 @@ msgid ""
 "reapers."
 msgstr ""
 #: ../common/get_started_image_service.rst:14
 msgid ""
 "A number of periodic processes run on the OpenStack Image service to support "
 "caching. Replication services ensure consistency and availability through "
 "the cluster. Other periodic processes include auditors, updaters, and "
 "reapers."
 msgstr ""
 #: ../common/glossary.rst:2943 ../common/glossary.rst:2950
 msgid ""
 "A number within a database that is incremented each time a change is made. "
@@ -3219,6 +3234,13 @@ msgid ""
 "Service."
 msgstr ""
 #: ../common/get_started_identity.rst:29
 msgid ""
 "Data that confirms the user's identity. For example: user name and password, "
 "user name and API key, or an authentication token provided by the Identity "
 "service."
 msgstr ""
 #: ../common/glossary.rst:912
 msgid ""
 "Data that is only known to or accessible by a user and used to verify that "
@@ -3854,6 +3876,12 @@ msgid ""
 "packages Service::"
 msgstr ""
 #: ../common/cli_install_openstack_command_line_clients.rst:213
 msgid ""
 "For openSUSE, use zypper to install the clients from the distribution "
 "packages service::"
 msgstr ""
 #: ../common/app_support.rst:16
 msgid ""
 "For the available OpenStack documentation, see `docs.openstack.org <http://"
@@ -4176,6 +4204,12 @@ msgid ""
 "did not successfully download the images from the Image Service."
 msgstr ""
 #: ../common/support-compute.rst:135
 msgid ""
 "If any files are missing, empty, or very small, the ``nova-compute`` service "
 "did not successfully download the images from the Image service."
 msgstr ""
 #: ../common/support-compute.rst:192
 msgid ""
 "If instances do not boot or boot slowly, investigate file injection as a "
@@ -5301,6 +5335,16 @@ msgid ""
 "standard hardware, and download images to launch instances."
 msgstr ""
 #: ../common/get_started_compute.rst:10
 msgid ""
 "OpenStack Compute interacts with OpenStack Identity for authentication, "
 "OpenStack Image service for disk and server images, and OpenStack dashboard "
 "for the user and administrative interface. Image access is limited by "
 "projects, and by users; quotas are limited per project (the number of "
 "instances, for example). OpenStack Compute can scale horizontally on "
 "standard hardware, and download images to launch instances."
 msgstr ""
 #: ../common/get_started_identity.rst:4
 msgid "OpenStack Identity concepts"
 msgstr ""
@@ -5309,6 +5353,10 @@ msgstr ""
 msgid "OpenStack Image Service"
 msgstr ""
 #: ../common/get_started_image_service.rst:4
 msgid "OpenStack Image service"
 msgstr ""
 #: ../common/get_started_openstack_networking.rst:4
 msgid "OpenStack Networking"
 msgstr ""
@@ -6758,6 +6806,19 @@ msgid ""
 "repository types, including OpenStack Object Storage."
 msgstr ""
 #: ../common/get_started_image_service.rst:19
 msgid "The OpenStack Image service includes the following components:"
 msgstr ""
 #: ../common/get_started_image_service.rst:6
 msgid ""
 "The OpenStack Image service is central to Infrastructure-as-a-Service (IaaS) "
 "as shown in Conceptual architecture. It accepts API requests for disk or "
 "server images, and image metadata from end users or OpenStack Compute "
 "components. It also supports the storage of disk or server images on various "
 "repository types, including OpenStack Object Storage."
 msgstr ""
 #: ../common/get_started_object_storage.rst:6
 msgid ""
 "The OpenStack Object Storage is a multi-tenant object storage system. It is "
@@ -7549,6 +7610,12 @@ msgid ""
 "Service. Do not disclose it to users."
 msgstr ""
 #: ../common/get_started_image_service.rst:30
 msgid ""
 "The registry is a private internal service meant for use by OpenStack Image "
 "service. Do not disclose it to users."
 msgstr ""
 #: ../common/support-compute.rst:63
 msgid "The report has the following sections:"
 msgstr ""
--- a/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
+++ b/doc/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-19 06:17+0000\n"
-"PO-Revision-Date: 2015-07-14 00:33+0000\n"
+"PO-Revision-Date: 2015-07-14 14:01+0000\n"
-"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/p/openstack-manuals-i18n/"
 "language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -5073,6 +5073,9 @@ msgstr "OpenStack Identity の概念"
 msgid "OpenStack Image Service"
 msgstr "OpenStack Image Service"
 msgid "OpenStack Image service"
 msgstr "OpenStack Image service"
 msgid "OpenStack Networking"
 msgstr "OpenStack Networking"
--- 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-07-14 06:13+0000\n"
+"POT-Creation-Date: 2015-07-15 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"
@@ -5641,7 +5641,7 @@ msgid "Some systems require that you enable VT support in the system BIOS. If yo
 msgstr ""
 #: ./doc/common/section_kvm_enable.xml:75(para)
-msgid "If KVM acceleration is not supported, configure Compute to use a different hypervisor, such as <link xlink:href=\"http://docs.openstack.org/trunk/config-reference/content/qemu.html\">QEMU</link> or <link xlink:href=\"http://docs.openstack.org/trunk/config-reference/content/introduction-to-xen.html\">Xen</link>."
+msgid "If KVM acceleration is not supported, configure Compute to use a different hypervisor, such as <link xlink:href=\"http://docs.openstack.org/trunk/config-reference/content/qemu.html\">QEMU</link> or <link xlink:href=\"http://docs.openstack.org/trunk/config-reference/content/xen_libvirt.html\">Xen</link>."
 msgstr ""
 #: ./doc/common/section_kvm_enable.xml:81(para)
--- a/doc/common/locale/ja.po
+++ b/doc/common/locale/ja.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-07-13 21:05+0000\n"
+"POT-Creation-Date: 2015-07-15 05:02+0000\n"
-"PO-Revision-Date: 2015-07-14 00:21+0000\n"
+"PO-Revision-Date: 2015-07-15 05:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/p/openstack-manuals-i18n/"
 "language/ja/)\n"
@@ -1679,6 +1679,9 @@ msgstr "OpenStack Compute"
 msgid "OpenStack Identity concepts"
 msgstr "OpenStack Identity の概念"
 msgid "OpenStack Image service"
 msgstr "OpenStack Image service"
 msgid "OpenStack Networking"
 msgstr "OpenStack Networking"
--- a/doc/config-reference/locale/config-reference.pot
+++ b/doc/config-reference/locale/config-reference.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-07-13 06:17+0000\n"
+"POT-Creation-Date: 2015-07-15 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"
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Cloud end users can find out how to resize a server by reading the <link xlink:href=\"http://docs.openstack.org/user-guide/cli_change_the_size_of_your_server.html\">OpenStack End User Guide</link>."
 msgstr ""
-#: ./doc/config-reference/ch_computeconfigure.xml:77(title) ./doc/config-reference/compute/section_introduction-to-xen.xml:59(title)
+#: ./doc/config-reference/ch_computeconfigure.xml:77(title) ./doc/config-reference/compute/section_hypervisor_xen_api.xml:59(title)
 msgid "XenServer"
 msgstr ""
@@ -1893,188 +1893,6 @@ msgstr ""
 msgid "To customize the Compute scheduler, use the configuration option settings documented in <xref linkend=\"config_table_nova_scheduler\"/>."
 msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:156(None)
 msgid "@@image: '../../common/figures/xenserver_architecture.png'; md5=99792432daf7f0302672fb8f03cb63bb"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:8(title)
 msgid "Xen, XAPI, XenServer"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:9(para)
 msgid "This section describes XAPI managed hypervisors, and how to use them with OpenStack."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:14(title)
 msgid "Terminology"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:16(title)
 msgid "Xen"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:17(para)
 msgid "A hypervisor that provides the fundamental isolation between virtual machines. Xen is open source (GPLv2) and is managed by Xen.org, a cross-industry organization and a Linux Foundation Collaborative project."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:23(para)
 msgid "Xen is a component of many different products and projects. The hypervisor itself is very similar across all these projects, but the way that it is managed can be different, which can cause confusion if you're not clear which toolstack you are using. Make sure you know what toolstack you want before you get started."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:33(title)
 msgid "XAPI"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:34(para)
 msgid "XAPI is one of the toolstacks that could control a Xen based hypervisor. XAPI's role is similar to libvirt's in the KVM world. The API provided by XAPI is called XenAPI. To learn more about the provided interface, look at <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/sdk.html#object_model_overview\"> XenAPI Object Model Overview </link> for definitions of XAPI specific terms such as SR, VDI, VIF and PIF."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:46(para)
 msgid "OpenStack has a compute driver which talks to XAPI, therefore all XAPI managed servers could be used with OpenStack."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:52(title)
 msgid "XenAPI"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:53(para)
 msgid "XenAPI is the API provided by XAPI. This name is also used by the python library that is a client for XAPI."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:60(para)
 msgid "An Open Source virtualization platform that delivers all features needed for any server and datacenter implementation including the Xen hypervisor and XAPI for the management. For more information and product downloads, visit <link xlink:href=\"http://xenserver.org/\"> xenserver.org </link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:72(title)
 msgid "XCP"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:73(para)
 msgid "XCP is not supported anymore. XCP project recommends all XCP users to upgrade to the latest version of XenServer by visiting <link xlink:href=\"http://xenserver.org/\"> xenserver.org </link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:83(title)
 msgid "XenServer-core"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:84(para)
 msgid "This is a method for building the core packages in a XenServer installation on an existing RPM-based system. Initial support for this configuration (notably running Compute services in domain 0) was added in Havana. XenServer-core for Debian/Ubuntu is built from the main branch and, therefore, is continuously up to date."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:93(title)
 msgid "Kronos"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:94(para)
 msgid "This is a project initiated to provide the ability to install XAPI toolstack onto an existing Debian-based deployment. For more information, visit the Xen wiki <link xlink:href=\"http://wiki.xen.org/wiki/Project_Kronos\"> wiki.xen.org/wiki/Project_Kronos </link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:105(title)
 msgid "Privileged and unprivileged domains"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:106(para)
 msgid "A Xen host runs a number of virtual machines, VMs, or domains (the terms are synonymous on Xen). One of these is in charge of running the rest of the system, and is known as domain 0, or dom0. It is the first domain to boot after Xen, and owns the storage and networking hardware, the device drivers, and the primary control software. Any other VM is unprivileged, and is known as a domU or guest. All customer VMs are unprivileged, but you should note that on Xen, the OpenStack Compute service (<systemitem class=\"service\">nova-compute</systemitem>) also runs in a domU. This gives a level of security isolation between the privileged system software and the OpenStack software (much of which is customer-facing). This architecture is described in more detail later."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:123(title)
 msgid "Paravirtualized versus hardware virtualized domains"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:124(para)
 msgid "A Xen virtual machine can be paravirtualized (PV) or hardware virtualized (HVM). This refers to the interaction between Xen, domain 0, and the guest VM's kernel. PV guests are aware of the fact that they are virtualized and will co-operate with Xen and domain 0; this gives them better performance characteristics. HVM guests are not aware of their environment, and the hardware has to pretend that they are running on an unvirtualized machine. HVM guests do not need to modify the guest operating system, which is essential when running Windows."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:136(para)
 msgid "In OpenStack, customer VMs may run in either PV or HVM mode. However, the OpenStack domU (that's the one running <systemitem class=\"service\">nova-compute</systemitem>) must be running in PV mode."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:145(title)
 msgid "XenAPI deployment architecture"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:148(para)
 msgid "A basic OpenStack deployment on a XAPI-managed server, assuming that the network provider is nova-network, looks like this: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:165(para)
 msgid "The hypervisor: Xen"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:170(para)
 msgid "Domain 0: runs XAPI and some small pieces from OpenStack, the XAPI plug-ins."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:176(para)
 msgid "OpenStack VM: The <systemitem class=\"service\">Compute</systemitem> service runs in a paravirtualized virtual machine, on the host under management. Each host runs a local instance of <systemitem class=\"service\">Compute</systemitem>. It is also running an instance of nova-network."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:187(para)
 msgid "OpenStack Compute uses the XenAPI Python library to talk to XAPI, and it uses the Management Network to reach from the OpenStack VM to Domain 0."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:161(para)
 msgid "Key things to note: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:199(para)
 msgid "The above diagram assumes FlatDHCP networking."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:208(para)
 msgid "Management network: RabbitMQ, MySQL, inter-host communication, and compute-XAPI communication. Please note that the VM images are downloaded by the XenAPI plug-ins, so make sure that the OpenStack Image service is accessible through this network. It usually means binding those services to the management interface."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:220(para)
 msgid "Tenant network: controlled by nova-network, this is used for tenant traffic."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:227(para)
 msgid "Public network: floating IPs, public API endpoints."
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:204(para)
 msgid "There are three main OpenStack networks: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:236(para)
 msgid "The networks shown here must be connected to the corresponding physical networks within the data center. In the simplest case, three individual physical network cards could be used. It is also possible to use VLANs to separate these networks. Please note, that the selected configuration must be in line with the networking model selected for the cloud. (In case of VLAN networking, the physical channels have to be able to forward the tagged traffic.)"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:195(para)
 msgid "Some notes on the networking: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:252(title)
 msgid "Further reading"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:258(para)
 msgid "Citrix XenServer official documentation: <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/\"> http://docs.vmd.citrix.com/XenServer </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:267(para)
 msgid "What is Xen? by Xen.org: <link xlink:href=\"http://xen.org/files/Marketing/WhatisXen.pdf\"> http://xen.org/files/Marketing/WhatisXen.pdf </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:276(para)
 msgid "Xen Hypervisor project: <link xlink:href=\"http://www.xenproject.org/developers/teams/hypervisor.html\"> http://www.xenproject.org/developers/teams/hypervisor.html </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:285(para)
 msgid "Xapi project: <link xlink:href=\"http://www.xenproject.org/developers/teams/xapi.html\"> http://www.xenproject.org/developers/teams/xapi.html </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:294(para)
 msgid "Further XenServer and OpenStack information: <link xlink:href=\"http://wiki.openstack.org/XenServer\"> http://wiki.openstack.org/XenServer </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_introduction-to-xen.xml:253(para)
 msgid "Here are some of the resources available to learn more about Xen: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-backing-storage.xml:6(title)
 msgid "Configure Compute backing storage"
 msgstr ""
@@ -3310,33 +3128,97 @@ msgid "<link xlink:href=\"http://www.vmware.com/products/vsphere-hypervisor/supp
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-hypervisors.xml:52(para)
-msgid "<link xlink:href=\"http://www.xen.org\">Xen</link> - XenServer, Xen Cloud Platform (XCP), use to run Linux or Windows virtual machines. You must install the <systemitem class=\"service\">nova-compute</systemitem> service in a para-virtualized VM."
+msgid "<link xlink:href=\"http://www.xenproject.org\">Xen (using libvirt)</link> - Xen Project Hypervisor using libvirt as management interface into <systemitem class=\"service\">nova-compute</systemitem> to run Linux, Windows, FreeBSD and NetBSD virtual machines."
 msgstr ""
-#: ./doc/config-reference/compute/section_compute-hypervisors.xml:60(para)
+#: ./doc/config-reference/compute/section_compute-hypervisors.xml:57(para)
 msgid "<link xlink:href=\"http://www.xenserver.org\">XenServer</link> - XenServer, Xen Cloud Platform (XCP) and other XAPI based Xen variants runs Linux or Windows virtual machines. You must install the <systemitem class=\"service\">nova-compute</systemitem> service in a para-virtualized VM."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-hypervisors.xml:65(para)
 msgid "<link xlink:href=\"http://www.microsoft.com/en-us/server-cloud/windows-server/server-virtualization-features.aspx\"> Hyper-V</link> - Server virtualization with Microsoft's Hyper-V, use to run Windows, Linux, and FreeBSD virtual machines. Runs <systemitem class=\"service\">nova-compute</systemitem> natively on the Windows virtualization platform."
 msgstr ""
-#: ./doc/config-reference/compute/section_compute-hypervisors.xml:70(title)
+#: ./doc/config-reference/compute/section_compute-hypervisors.xml:75(title)
 msgid "Hypervisor configuration basics"
 msgstr ""
-#: ./doc/config-reference/compute/section_compute-hypervisors.xml:71(para)
+#: ./doc/config-reference/compute/section_compute-hypervisors.xml:76(para)
 msgid "The node where the <systemitem class=\"service\">nova-compute</systemitem> service is installed and operates on the same node that runs all of the virtual machines. This is referred to as the compute node in this guide."
 msgstr ""
-#: ./doc/config-reference/compute/section_compute-hypervisors.xml:75(para)
+#: ./doc/config-reference/compute/section_compute-hypervisors.xml:80(para)
 msgid "By default, the selected hypervisor is KVM. To change to another hypervisor, change the <literal>virt_type</literal> option in the <literal>[libvirt]</literal> section of <filename>nova.conf</filename> and restart the <systemitem class=\"service\">nova-compute</systemitem> service."
 msgstr ""
-#: ./doc/config-reference/compute/section_compute-hypervisors.xml:79(para)
+#: ./doc/config-reference/compute/section_compute-hypervisors.xml:84(para)
 msgid "Here are the general <filename>nova.conf</filename> options that are used to configure the compute node's hypervisor: <xref linkend=\"config_table_nova_hypervisor\"/>."
 msgstr ""
-#: ./doc/config-reference/compute/section_compute-hypervisors.xml:82(para)
+#: ./doc/config-reference/compute/section_compute-hypervisors.xml:87(para)
 msgid "Specific options for particular hypervisors can be found in the following sections."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:6(title) ./doc/config-reference/compute/section_compute-configure-xapi.xml:75(title)
 msgid "XenAPI configuration reference"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:7(para)
 msgid "The following section discusses some commonly changed options when using the XenAPI driver. The table below provides a complete reference of all configuration options available for configuring XAPI with OpenStack."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:13(para)
 msgid "The recommended way to use XAPI with OpenStack is through the XenAPI driver. To enable the XenAPI driver, add the following configuration options to <filename>/etc/nova/nova.conf</filename> and restart <systemitem class=\"service\">OpenStack Compute</systemitem>:"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:21(replaceable)
 msgid "your_xenapi_management_ip_address"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:23(replaceable)
 msgid "your_password"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:24(para)
 msgid "These connection details are used by OpenStack Compute service to contact your hypervisor and are the same details you use to connect XenCenter, the XenServer management console, to your XenServer node."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:30(para)
 msgid "The <literal>connection_url</literal> is generally the management network IP address of the XenServer."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:36(title) ./doc/config-reference/networking/section_networking-options-reference.xml:20(title)
 msgid "Agent"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:37(para)
 msgid "The agent is a piece of software that runs on the instances, and communicates with OpenStack. In case of the XenAPI driver, the agent communicates with OpenStack through XenStore (see <link xlink:href=\"http://wiki.xenproject.org/wiki/XenStore\">the Xen Project Wiki</link> for more information on XenStore)."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:44(para)
 msgid "If you don't have the guest agent on your VMs, it takes a long time for OpenStack Compute to detect that the VM has successfully started. Generally a large timeout is required for Windows instances, but you may want to adjust: <literal>agent_version_timeout</literal> within the <literal>[xenserver]</literal> section."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:54(title)
 msgid "VNC proxy address"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:55(para)
 msgid "Assuming you are talking to XAPI through a management network, and XenServer is on the address: 10.10.1.34 specify the same address for the vnc proxy address: <literal>vncserver_proxyclient_address=<replaceable>10.10.1.34</replaceable></literal>"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:63(title)
 msgid "Storage"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:64(para)
 msgid "You can specify which Storage Repository to use with nova by editing the following flag. To use the local-storage setup by the default installer: <placeholder-1/> Another alternative is to use the \"default\" storage (for example if you have attached NFS or any other shared storage): <placeholder-2/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xapi.xml:76(para)
 msgid "To customize the XenAPI driver, use the configuration option settings documented in <xref linkend=\"config_table_nova_xen\"/>."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-ami-setup.xml:8(title)
 msgid "Prepare for AMI type images"
 msgstr ""
@@ -3509,6 +3391,182 @@ msgstr ""
 msgid "For a complete list of all available configuration options for each OpenStack Compute service, run bin/nova-&lt;servicename&gt; --help."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:8(title)
 msgid "Xen via Libvirt"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:9(para)
 msgid "OpenStack Compute supports the Xen Project Hypervisor (or Xen). Xen can be integrated with OpenStack Compute via the <link xlink:href=\"http://libvirt.org/\">libvirt</link><link xlink:href=\"http://wiki.xen.org/wiki/Choice_of_Toolstacks\">toolstack</link> or via the <link xlink:href=\"http://xenproject.org/developers/teams/xapi.html\">XAPI</link><link xlink:href=\"http://wiki.xen.org/wiki/Choice_of_Toolstacks\">toolstack</link>. This section describes how to set up OpenStack Compute with Xen and libvirt. For information on how to set up Xen with XAPI refer to <xref linkend=\"section_hypervisor_xen_xapi\"/>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:17(title)
 msgid "Installing Xen with Libvirt"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:18(para)
 msgid "At this stage we recommend to use the baseline that we use for the <link xlink:href=\"http://wiki.xenproject.org/wiki/OpenStack_CI_Loop_for_Xen-Libvirt\">Xen Project OpenStack CI Loop</link>, which contains the most recent stability fixes to both Xen and Libvirt."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:22(para)
 msgid "<link xlink:href=\"http://www.xenproject.org/downloads/xen-archives/xen-45-series/xen-451.html\">Xen 4.5.1</link> (or newer) and <link xlink:href=\"http://libvirt.org/sources/\">Libvirt 1.2.15</link> (or newer) contain the most recent OpenStack improvements for Xen. The necessary Xen changes have also been backported to the Xen 4.4.3 stable branch (not yet released at this stage). Please check with the Linux and FreeBSD distros you are intending to use as <link xlink:href=\"http://wiki.xenproject.org/wiki/Category:Host_Install\">Dom 0</link>, whether the relevant version of Xen and Libvirt are available as installable packages."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:32(para)
 msgid "The latest releases of Xen and libvirt packages that fulfil the above minimum requirements for the various openSUSE distributions can always be found and installed from the <link xlink:href=\"https://build.opensuse.org/project/show/Virtualization\">Open Build Service</link> Virtualization project. To install these latest packages, add the Virtualization repository to your software management stack and get the newest packages from there. More information about the latest Xen and Libvirt packages are avalable <link xlink:href=\"https://build.opensuse.org/package/show/Virtualization/xen\">here</link> and <link xlink:href=\"https://build.opensuse.org/package/show/Virtualization/libvirt\">here</link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:42(para)
 msgid "Alternatively, it is possible to use the Ubuntu LTS 14.04 Xen Package <emphasis>4.4.1-0ubuntu0.14.04.4</emphasis> (Xen 4.4.1) and apply the patches outlined <link xlink:href=\"http://wiki.xenproject.org/wiki/OpenStack_CI_Loop_for_Xen-Libvirt#Baseline\">here</link>. You can also use the Ubuntu LTS 14.04 libvirt package <emphasis>1.2.2 libvirt_1.2.2-0ubuntu13.1.7</emphasis> as baseline and update it to libvirt version 1.2.15, or 1.2.14 with the patches outlined <link xlink:href=\"http://wiki.xenproject.org/wiki/OpenStack_CI_Loop_for_Xen-Libvirt#Baseline\">here</link> applied. Note that this will require re-build these packages partly from source."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:52(para)
 msgid "For further information and latest developments, you may want to consult the Xen Project's <link xlink:href=\"http://lists.xenproject.org/cgi-bin/mailman/listinfo/wg-openstack\">mailing lists for OpenStack related issues and questions</link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:58(title)
 msgid "Configuring Xen with Libvirt"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:59(para)
 msgid "To enable Xen via libvirt, ensure the following options are set in <filename>/etc/nova/nova.conf</filename> on all hosts running the <systemitem class=\"service\">nova-compute</systemitem> service.<placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:68(title)
 msgid "Additional configuration options"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:69(para)
 msgid "Use the following as a guideline for configuring Xen for use in OpenStack:"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:72(para)
 msgid "<emphasis role=\"bold\">Dom0 Memory:</emphasis> Set it between 1GB and 4GB by adding the following parameter to the Xen Boot Options in the <filename><link xlink:href=\"http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html\">grub.conf</link></filename> file. <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:77(para)
 msgid "Note that the above memory limits are suggestions and should be based on the available compute host resources. For large hosts, that will run many hundred of instances,the chosen values may need to be higher."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:80(para)
 msgid "The location of the grub.conf file depends on the host Linux distribution that you are using. Please refer to the distro documentation for more details (see <link xlink:href=\"http://wiki.xenproject.org/wiki/Category:Host_Install\">Dom 0</link> for more resources)."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:86(para)
 msgid "<emphasis role=\"bold\">Dom0 vcpus:</emphasis> Set the virtual CPUs to 4 and employ CPU pinning by adding the following parameters to the Xen Boot Options in the <filename><link xlink:href=\"http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html\">grub.conf</link></filename> file. <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:92(para)
 msgid "Note that the above virtual CPU limits are suggestions and should be based on the available compute host resources. For large hosts, that will run many hundred of instances, the suggested values may need to be higher."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:97(para)
 msgid "<emphasis role=\"bold\">PV vs HVM guests:</emphasis> A Xen virtual machine can be paravirtualized (PV) or hardware virtualized (HVM). The virtualization mode determines the interaction between Xen, Dom 0, and the guest VM's kernel. PV guests are aware of the fact that they are virtualized and will co-operate with Xen and Dom 0. The choice of virtualization mode determines performance characteristics. For an overview of Xen virtualization modes, see <link xlink:href=\"http://wiki.xen.org/wiki/Xen_Overview#Guest_Types\"> Xen Guest Types</link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:105(para)
 msgid "In OpenStack, customer VMs may run in either PV or HVM mode. The mode is a property of the operating system image used by the VM, and is changed by adjusting the image metadata stored in the glance image service. The image metadata can be changed using the nova or glance commands."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:110(para)
 msgid "To choose one of the HVM modes (HVM, HVM with PV Drivers or PVHVM) use nova or glance to set the vm_mode property to hvm"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:115(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:116(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:119(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:120(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:141(replaceable) ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:142(replaceable)
 msgid "img-uuid"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:113(para)
 msgid "To choose one of the HVM modes (HVM, HVM with PV Drivers or PVHVM) use one of the following two commands <placeholder-1/><placeholder-2/> To chose PV mode, which is supported by NetBSD, FreeBSD and Linux, useone of the following two commands <placeholder-3/><placeholder-4/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:122(para)
 msgid "The default for virtualization mode in nova is PV mode."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:125(para)
 msgid "<emphasis role=\"bold\">Image Formats:</emphasis> Xen supports raw, qcow2 and vhd image formats. For more information on image formats, refer to the <link xlink:href=\"http://docs.openstack.org/image-guide/content/ch_introduction.html\">OpenStack Virtual Image Guide</link> and the <link xlink:href=\"http://wiki.xenproject.org/wiki/Storage_options\">Storage Options Guide on the Xen Project Wiki</link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:133(para)
 msgid "<emphasis role=\"bold\">Image Metadata:</emphasis> In addition to the vm_mode property discussed above, the hypervisor_type property is another important component of the image metadata, especially if your cloud contains mixed hypervisor compute nodes. Setting the hypervisor_type property allows the nova scheduler to select a compute node running the specified hypervisor when launching instances of the image. Image metadata such as vm_mode, hypervisor_type, architecture, and others can be set when importing the image to glance. The metatdata can also be changed using the nova or glance commands: <placeholder-1/><placeholder-2/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:144(para)
 msgid "For more more information on image metadata, refer to the <link xlink:href=\"http://docs.openstack.org/image-guide/content/image-metadata.html\">OpenStack Virtual Image Guide</link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:150(para)
 msgid "To customize the libvirt driver, use the configuration option settings documented in <xref linkend=\"config_table_nova_xen\"/>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:155(title)
 msgid "Troubleshoot Xen with Libvirt"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:161(para)
 msgid "<filename>/var/log/nova/compute.log</filename> (for more information refer to <xref linkend=\"section_nova-logs\"/>)."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:163(para)
 msgid "<filename>/var/log/libvirt/libxl/libxl-driver.log</filename>,"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:164(para)
 msgid "<filename>/var/log/xen/qemu-dm-${instancename}.log</filename>,"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:165(para)
 msgid "<filename>/var/log/xen/xen-hotplug.log</filename>,"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:166(para)
 msgid "<filename>/var/log/xen/console/guest-${instancename}</filename> (to enable see <link xlink:href=\"http://wiki.xen.org/wiki/Reporting_Bugs_against_Xen#Guest_console_logs\">Enabling Guest Console Logs</link>) and"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:170(para)
 msgid "Host Console Logs (read <link xlink:href=\"http://wiki.xen.org/wiki/Reporting_Bugs_against_Xen#Host_console_logs\">Enabling and Retrieving Host Console Logs</link>)."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:158(para)
 msgid "<emphasis role=\"bold\">Important Log Files:</emphasis> When an instance fails to start, or when you come across other issues, you should first consult the following log files: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:176(para)
 msgid "If you need further help you can ask questions on the mailing lists <link xlink:href=\"http://lists.xenproject.org/cgi-bin/mailman/listinfo/xen-users\">xen-users@</link>, <link xlink:href=\"http://lists.xenproject.org/cgi-bin/mailman/listinfo/wg-openstack\">wg-openstack@</link> or <link xlink:href=\"http://wiki.xen.org/wiki/Reporting_Bugs_against_Xen\">raise a bug</link> against Xen."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:187(title)
 msgid "Known issues"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:190(para)
 msgid "Xen via libvirt is currently only supported with nova networking. A number of bugs are currently worked on to make sure that Xen via libvirt will also work with Neutron."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:196(title)
 msgid "Additional information and resources"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:197(para)
 msgid "The following section contains links to other useful resources"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:200(para)
 msgid "<link xlink:href=\"http://wiki.xenproject.org/wiki/OpenStack\">wiki.xenproject.org/wiki/OpenStack</link> - OpenStack Documentation on the Xen Project wiki"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:205(para)
 msgid "<link xlink:href=\"http://wiki.xenproject.org/wiki/OpenStack_CI_Loop_for_Xen-Libvirt\">wiki.xenproject.org/wiki/OpenStack_CI_Loop_for_Xen-Libvirt</link> - Information about the Xen Project OpenStack CI Loop"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:211(para)
 msgid "<link xlink:href=\"http://wiki.xenproject.org/wiki/OpenStack_via_DevStack\">wiki.xenproject.org/wiki/OpenStack_via_DevStack</link> - How to set up OpenStack via DevStack"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_libvirt.xml:216(para)
 msgid "<link xlink:href=\"http://lists.xenproject.org/cgi-bin/mailman/listinfo/wg-openstack\">Mailing lists for OpenStack related issues and questions</link> - This list is dedicated to coordinating bug fixes and issues across Xen, libvirt and OpenStack and the CI loop."
 msgstr ""
 #: ./doc/config-reference/compute/section_nova-log-files.xml:7(title)
 msgid "Compute log files"
 msgstr ""
@@ -3821,66 +3879,6 @@ msgstr ""
 msgid "The scheme can be either <literal>qpid</literal> or <literal>rabbit</literal>, as shown previously. The following sample shows this optional configuration:"
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:7(title)
 msgid "Install XenServer"
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:8(para)
 msgid "Before you can run OpenStack with XenServer, you must install the hypervisor on <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/installation.html#sys_requirements\"> an appropriate server </link> ."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:18(para)
 msgid "Xen is a type 1 hypervisor: When your server starts, Xen is the first software that runs. Consequently, you must install XenServer before you install the operating system where you want to run OpenStack code. You then install <systemitem class=\"service\">nova-compute</systemitem> into a dedicated virtual machine on the host."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:33(link)
 msgid "http://xenserver.org/open-source-virtualization-download.html"
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:27(para)
 msgid "Use the following link to download XenServer's installation media: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:40(para)
 msgid "When you install many servers, you might find it easier to perform <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/installation.html#pxe_boot_install\"> PXE boot installations </link> . You can also package any post-installation changes that you want to make to your XenServer by following the instructions of <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/supplemental_pack_ddk.html\"> creating your own XenServer supplemental pack </link> ."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:55(para)
 msgid "Make sure you use the EXT type of storage repository (SR). Features that require access to VHD files (such as copy on write, snapshot and migration) do not work when you use the LVM SR. Storage repository (SR) is a XAPI-specific term relating to the physical storage where virtual disks are stored."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:62(para)
 msgid "On the XenServer installation screen, choose the <guilabel>XenDesktop Optimized</guilabel> option. If you use an answer file, make sure you use <literal>srtype=\"ext\"</literal> in the <literal>installation</literal> tag of the answer file."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:73(title)
 msgid "Post-installation steps"
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:74(para)
 msgid "The following steps need to be completed after the hypervisor's installation:"
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:80(para)
 msgid "For resize and migrate functionality, enable password-less SSH authentication and set up the <literal>/images</literal> directory on dom0."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:88(para)
 msgid "Install the XAPI plug-ins."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:93(para)
 msgid "To support AMI type images, you must set up <literal>/boot/guest</literal> symlink/directory in dom0."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:100(para)
 msgid "Create a paravirtualized virtual machine that can run <systemitem class=\"service\">nova-compute</systemitem>."
 msgstr ""
 #: ./doc/config-reference/compute/section_xen-install.xml:106(para)
 msgid "Install and configure <systemitem class=\"service\">nova-compute</systemitem> in the above virtual machine."
 msgstr ""
 #: ./doc/config-reference/compute/section_nova-conf.xml:7(title)
 msgid "Overview of nova.conf"
 msgstr ""
@@ -4169,70 +4167,6 @@ msgstr ""
 msgid "Use these options to configure the <application>RabbitMQ</application> and <application>Qpid</application> messaging drivers."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:6(title)
 msgid "Xen configuration reference"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:7(para)
 msgid "The following section discusses some commonly changed options when using the XenAPI driver. The table below provides a complete reference of all configuration options available for configuring XAPI with OpenStack."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:13(para)
 msgid "The recommended way to use XAPI with OpenStack is through the XenAPI driver. To enable the XenAPI driver, add the following configuration options to <filename>/etc/nova/nova.conf</filename> and restart <systemitem class=\"service\">OpenStack Compute</systemitem>:"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:21(replaceable)
 msgid "your_xenapi_management_ip_address"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:23(replaceable)
 msgid "your_password"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:24(para)
 msgid "These connection details are used by OpenStack Compute service to contact your hypervisor and are the same details you use to connect XenCenter, the XenServer management console, to your XenServer node."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:30(para)
 msgid "The <literal>connection_url</literal> is generally the management network IP address of the XenServer."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:36(title) ./doc/config-reference/networking/section_networking-options-reference.xml:20(title)
 msgid "Agent"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:37(para)
 msgid "The agent is a piece of software that runs on the instances, and communicates with OpenStack. In case of the XenAPI driver, the agent communicates with OpenStack through XenStore (see <link xlink:href=\"http://wiki.xen.org/wiki/XenStore\">the Xen Wiki</link> for more information on XenStore)."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:44(para)
 msgid "If you don't have the guest agent on your VMs, it takes a long time for OpenStack Compute to detect that the VM has successfully started. Generally a large timeout is required for Windows instances, but you may want to adjust: <literal>agent_version_timeout</literal> within the <literal>[xenserver]</literal> section."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:54(title)
 msgid "VNC proxy address"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:55(para)
 msgid "Assuming you are talking to XAPI through a management network, and XenServer is on the address: 10.10.1.34 specify the same address for the vnc proxy address: <literal>vncserver_proxyclient_address=<replaceable>10.10.1.34</replaceable></literal>"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:63(title)
 msgid "Storage"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:64(para)
 msgid "You can specify which Storage Repository to use with nova by editing the following flag. To use the local-storage setup by the default installer: <placeholder-1/> Another alternative is to use the \"default\" storage (for example if you have attached NFS or any other shared storage): <placeholder-2/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:75(title)
 msgid "XenAPI configuration reference"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-configure-xen.xml:76(para)
 msgid "To customize the XenAPI driver, use the configuration option settings documented in <xref linkend=\"config_table_nova_xen\"/>."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-iscsioffload.xml:7(title)
 msgid "iSCSI interface and offload support in Compute"
 msgstr ""
@@ -4473,6 +4407,188 @@ msgstr ""
 msgid "If it is not set to <systemitem>kvm</systemitem>, run:"
 msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:156(None)
 msgid "@@image: '../../common/figures/xenserver_architecture.png'; md5=99792432daf7f0302672fb8f03cb63bb"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:8(title)
 msgid "XenServer (and other XAPI based Xen variants)"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:9(para)
 msgid "This section describes XAPI managed hypervisors, and how to use them with OpenStack."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:14(title)
 msgid "Terminology"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:16(title)
 msgid "Xen"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:17(para)
 msgid "A hypervisor that provides the fundamental isolation between virtual machines. Xen is open source (GPLv2) and is managed by <link xlink:href=\"http://www.xenproject.org\">XenProject.org</link>, a cross-industry organization and a Linux Foundation Collaborative project."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:24(para)
 msgid "Xen is a component of many different products and projects. The hypervisor itself is very similar across all these projects, but the way that it is managed can be different, which can cause confusion if you're not clear which toolstack you are using. Make sure you know what <link xlink:href=\"http://wiki.xen.org/wiki/Choice_of_Toolstacks\">toolstack</link> you want before you get started. If you want to use Xen with libvirt in OpenStack Compute refer to <xref linkend=\"xen_libvirt\"/>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:33(title)
 msgid "XAPI"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:34(para)
 msgid "XAPI is one of the toolstacks that could control a Xen based hypervisor. XAPI's role is similar to libvirt's in the KVM world. The API provided by XAPI is called XenAPI. To learn more about the provided interface, look at <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/sdk.html#object_model_overview\"> XenAPI Object Model Overview </link> for definitions of XAPI specific terms such as SR, VDI, VIF and PIF."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:46(para)
 msgid "OpenStack has a compute driver which talks to XAPI, therefore all XAPI managed servers could be used with OpenStack."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:52(title)
 msgid "XenAPI"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:53(para)
 msgid "XenAPI is the API provided by XAPI. This name is also used by the python library that is a client for XAPI."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:60(para)
 msgid "An Open Source virtualization platform that delivers all features needed for any server and datacenter implementation including the Xen hypervisor and XAPI for the management. For more information and product downloads, visit <link xlink:href=\"http://xenserver.org/\"> xenserver.org </link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:72(title)
 msgid "XCP"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:73(para)
 msgid "XCP is not supported anymore. XCP project recommends all XCP users to upgrade to the latest version of XenServer by visiting <link xlink:href=\"http://xenserver.org/\"> xenserver.org </link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:83(title)
 msgid "XenServer-core"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:84(para)
 msgid "This is a method for building the core packages in a XenServer installation on an existing RPM-based system. Initial support for this configuration (notably running Compute services in domain 0) was added in Havana. XenServer-core for Debian/Ubuntu is built from the main branch and, therefore, is continuously up to date."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:93(title)
 msgid "Kronos"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:94(para)
 msgid "This is a project initiated to provide the ability to install XAPI toolstack onto an existing Debian-based deployment. For more information, visit the Xen wiki <link xlink:href=\"http://wiki.xenproject.org/wiki/Project_Kronos\"> wiki.xenproject.org/wiki/Project_Kronos </link>."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:105(title)
 msgid "Privileged and unprivileged domains"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:106(para)
 msgid "A Xen host runs a number of virtual machines, VMs, or domains (the terms are synonymous on Xen). One of these is in charge of running the rest of the system, and is known as domain 0, or dom0. It is the first domain to boot after Xen, and owns the storage and networking hardware, the device drivers, and the primary control software. Any other VM is unprivileged, and is known as a domU or guest. All customer VMs are unprivileged, but you should note that on Xen, the OpenStack Compute service (<systemitem class=\"service\">nova-compute</systemitem>) also runs in a domU. This gives a level of security isolation between the privileged system software and the OpenStack software (much of which is customer-facing). This architecture is described in more detail later."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:123(title)
 msgid "Paravirtualized versus hardware virtualized domains"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:124(para)
 msgid "A Xen virtual machine can be paravirtualized (PV) or hardware virtualized (HVM). This refers to the interaction between Xen, domain 0, and the guest VM's kernel. PV guests are aware of the fact that they are virtualized and will co-operate with Xen and domain 0; this gives them better performance characteristics. HVM guests are not aware of their environment, and the hardware has to pretend that they are running on an unvirtualized machine. HVM guests do not need to modify the guest operating system, which is essential when running Windows."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:136(para)
 msgid "In OpenStack, customer VMs may run in either PV or HVM mode. However, the OpenStack domU (that's the one running <systemitem class=\"service\">nova-compute</systemitem>) must be running in PV mode."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:145(title)
 msgid "XenAPI deployment architecture"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:148(para)
 msgid "A basic OpenStack deployment on a XAPI-managed server, assuming that the network provider is nova-network, looks like this: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:165(para)
 msgid "The hypervisor: Xen"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:170(para)
 msgid "Domain 0: runs XAPI and some small pieces from OpenStack, the XAPI plug-ins."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:176(para)
 msgid "OpenStack VM: The <systemitem class=\"service\">Compute</systemitem> service runs in a paravirtualized virtual machine, on the host under management. Each host runs a local instance of <systemitem class=\"service\">Compute</systemitem>. It is also running an instance of nova-network."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:187(para)
 msgid "OpenStack Compute uses the XenAPI Python library to talk to XAPI, and it uses the Management Network to reach from the OpenStack VM to Domain 0."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:161(para)
 msgid "Key things to note: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:199(para)
 msgid "The above diagram assumes FlatDHCP networking."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:208(para)
 msgid "Management network: RabbitMQ, MySQL, inter-host communication, and compute-XAPI communication. Please note that the VM images are downloaded by the XenAPI plug-ins, so make sure that the OpenStack Image service is accessible through this network. It usually means binding those services to the management interface."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:220(para)
 msgid "Tenant network: controlled by nova-network, this is used for tenant traffic."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:227(para)
 msgid "Public network: floating IPs, public API endpoints."
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:204(para)
 msgid "There are three main OpenStack networks: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:236(para)
 msgid "The networks shown here must be connected to the corresponding physical networks within the data center. In the simplest case, three individual physical network cards could be used. It is also possible to use VLANs to separate these networks. Please note, that the selected configuration must be in line with the networking model selected for the cloud. (In case of VLAN networking, the physical channels have to be able to forward the tagged traffic.)"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:195(para)
 msgid "Some notes on the networking: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:252(title)
 msgid "Further reading"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:258(para)
 msgid "Citrix XenServer official documentation: <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/\"> http://docs.vmd.citrix.com/XenServer </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:267(para)
 msgid "What is Xen? by XenProject.org: <link xlink:href=\"http://www.xenproject.org/users/cloud.html\"> XenProject.org &gt; Users &gt; Cloud </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:276(para)
 msgid "Xen Hypervisor project: <link xlink:href=\"http://www.xenproject.org/developers/teams/hypervisor.html\"> http://www.xenproject.org/developers/teams/hypervisor.html </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:285(para)
 msgid "Xapi project: <link xlink:href=\"http://www.xenproject.org/developers/teams/xapi.html\"> http://www.xenproject.org/developers/teams/xapi.html </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:294(para)
 msgid "Further XenServer and OpenStack information: <link xlink:href=\"http://wiki.openstack.org/XenServer\"> http://wiki.openstack.org/XenServer </link>"
 msgstr ""
 #: ./doc/config-reference/compute/section_hypervisor_xen_api.xml:253(para)
 msgid "Here are some of the resources available to learn more about Xen: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-sample-configuration-files.xml:6(title) ./doc/config-reference/dashboard/section_dashboard-sample-configuration-files.xml:7(title)
 msgid "Additional sample configuration files"
 msgstr ""
@@ -4541,6 +4657,66 @@ msgstr ""
 msgid "Remove temporary files/directories:"
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:7(title)
 msgid "Install XenServer"
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:8(para)
 msgid "Before you can run OpenStack with XenServer, you must install the hypervisor on <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/installation.html#sys_requirements\"> an appropriate server </link> ."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:18(para)
 msgid "Xen is a type 1 hypervisor: When your server starts, Xen is the first software that runs. Consequently, you must install XenServer before you install the operating system where you want to run OpenStack code. You then install <systemitem class=\"service\">nova-compute</systemitem> into a dedicated virtual machine on the host."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:33(link)
 msgid "http://xenserver.org/open-source-virtualization-download.html"
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:27(para)
 msgid "Use the following link to download XenServer's installation media: <placeholder-1/>"
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:40(para)
 msgid "When you install many servers, you might find it easier to perform <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/installation.html#pxe_boot_install\"> PXE boot installations </link> . You can also package any post-installation changes that you want to make to your XenServer by following the instructions of <link xlink:href=\"http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/supplemental_pack_ddk.html\"> creating your own XenServer supplemental pack </link> ."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:55(para)
 msgid "Make sure you use the EXT type of storage repository (SR). Features that require access to VHD files (such as copy on write, snapshot and migration) do not work when you use the LVM SR. Storage repository (SR) is a XAPI-specific term relating to the physical storage where virtual disks are stored."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:62(para)
 msgid "On the XenServer installation screen, choose the <guilabel>XenDesktop Optimized</guilabel> option. If you use an answer file, make sure you use <literal>srtype=\"ext\"</literal> in the <literal>installation</literal> tag of the answer file."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:73(title)
 msgid "Post-installation steps"
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:74(para)
 msgid "The following steps need to be completed after the hypervisor's installation:"
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:80(para)
 msgid "For resize and migrate functionality, enable password-less SSH authentication and set up the <literal>/images</literal> directory on dom0."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:88(para)
 msgid "Install the XAPI plug-ins."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:93(para)
 msgid "To support AMI type images, you must set up <literal>/boot/guest</literal> symlink/directory in dom0."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:100(para)
 msgid "Create a paravirtualized virtual machine that can run <systemitem class=\"service\">nova-compute</systemitem>."
 msgstr ""
 #: ./doc/config-reference/compute/section_xapi-install.xml:106(para)
 msgid "Install and configure <systemitem class=\"service\">nova-compute</systemitem> in the above virtual machine."
 msgstr ""
 #: ./doc/config-reference/compute/section_compute-conductor.xml:7(title)
 msgid "Conductor"
 msgstr ""
--- a/doc/image-guide/locale/zh_CN.po
+++ b/doc/image-guide/locale/zh_CN.po
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2015-07-09 05:22+0000\n"
+"POT-Creation-Date: 2015-07-15 05:02+0000\n"
-"PO-Revision-Date: 2015-07-01 13:52+0000\n"
+"PO-Revision-Date: 2015-07-15 05:03+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Last-Translator: 秋林 <chenqioulin_1983@163.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/p/openstack-manuals-"
 "i18n/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -76,6 +76,96 @@ msgstr "2014-10-15"
 msgid "2015"
 msgstr "2015"
 msgid ""
 "<link xlink:href=\"http://boxgrinder.org/\">BoxGrinder</link> is another "
 "tool for creating virtual machine images, which it calls appliances. "
 "BoxGrinder can create Fedora, Red Hat Enterprise Linux, or CentOS images. "
 "BoxGrinder is currently only supported on Fedora."
 msgstr ""
 "<link xlink:href=\"http://boxgrinder.org/\">BoxGrinder</link> 是另外一个创建"
 "虚拟机镜像的工具，也称器具。BoxGrinder 可以创建 Fedora, Red Hat Enterprise "
 "Linux, 或者 CentOS 镜像。BoxGrinder当前只支持在 Fedora 上运行。"
 msgid ""
 "<link xlink:href=\"http://docs.openstack.org/developer/diskimage-builder/"
 "\">Diskimage-builder</link> is an automated disk image creation tool that "
 "supports a variety of distributions and architectures. Diskimage-builder "
 "(DIB) can build images for Fedora, Red Hat Enterprise Linux, Ubuntu, Debian, "
 "CentOS, and openSUSE. DIB is organized in a series of elements that build on "
 "top of each other to create specific images."
 msgstr ""
 "<link xlink:href=\"http://docs.openstack.org/developer/diskimage-builder/\"> "
 "镜像生成器 </link> 是一个支持不同发行版以及体系架构的自动化磁盘镜像创建工具。"
 "镜像生成器（DIB）能为 Fedora, Red Hat Enterprise Linux, Ubuntu, Debian, "
 "CentOS, and openSUSE 生成镜像，DIB 是被组合一系列的工具之上的创建特殊镜像的基"
 "础。"
 msgid ""
 "<link xlink:href=\"http://imgfac.org/\">imagefactory</link> is a newer tool "
 "designed to automate the building, converting, and uploading images to "
 "different cloud providers. It uses Oz as its back-end and includes support "
 "for OpenStack-based clouds."
 msgstr ""
 "<link xlink:href=\"http://imgfac.org/\">imagefactory</link> 是一个设计为自动"
 "化创建，转换以及上传镜像到不同云提供商的较新的工具。他使用 Oz 做为后端，并支"
 "持包含基于 OpenStack 的云。"
 msgid ""
 "<link xlink:href=\"http://susestudio.com\">SUSE Studio</link> is a web "
 "application for building and testing software applications in a web browser. "
 "It supports the creation of physical, virtual or cloud-based applications "
 "and includes support for building images for OpenStack based clouds using "
 "SUSE Linux Enterprise and openSUSE as distributions."
 msgstr ""
 "<link xlink:href=\"http://susestudio.com\">SUSE Studio</link> 是创建和测试软"
 "件程序的基于浏览器的 web 程序。他支持创建物理，虚拟或者基于云端的应用程序，并"
 "且支持使用SUSE Linux Enterprise and openSUSE 发行版为基于 Openstack 的云创建"
 "镜像。"
 msgid ""
 "<link xlink:href=\"https://github.com/clalancette/oz/wiki\">Oz</link> is a "
 "command-line tool that automates the process of creating a virtual machine "
 "image file. Oz is a Python app that interacts with KVM to step through the "
 "process of installing a virtual machine. It uses a predefined set of "
 "kickstart (Red Hat-based systems) and preseed files (Debian-based systems) "
 "for operating systems that it supports, and it can also be used to create "
 "Microsoft Windows images. On Fedora, install Oz with yum:"
 msgstr ""
 "<link xlink:href=\"https://github.com/clalancette/oz/wiki\">Oz</link> 是一个"
 "自动化创建镜像文件的命令行工具。它是一个和 KVM 进行交互完成整个虚拟机镜像安装"
 "过程的 Python 程序。它使用操作系统支持的一系列预定义的 kickstart (红帽系)文件"
 "或 preseed 文件 （Debian 系），并且他也用于创建微软 Windows 镜像。在 Fedora "
 "上,使用 yum 安装 Oz:"
 msgid ""
 "<link xlink:href=\"https://github.com/jedi4ever/veewee\"> VeeWee</link> is "
 "often used to build <link xlink:href=\"http://vagrantup.com\">Vagrant</link> "
 "boxes, but it can also be used to build KVM images."
 msgstr ""
 "<link xlink:href=\"https://github.com/jedi4ever/veewee\"> VeeWee</link> 通常"
 "用于创建  <link xlink:href=\"http://vagrantup.com\">Vagrant</link> boxses，但"
 "它也可用于创建 KVM 镜像。"
 msgid ""
 "<link xlink:href=\"https://launchpad.net/vmbuilder\">VMBuilder</link> "
 "(Virtual Machine Builder) is a command-line tool that creates virtual "
 "machine images for different hypervisors. The version of VMBuilder that "
 "ships with Ubuntu can only create Ubuntu virtual machine guests. The version "
 "of VMBuilder that ships with Debian can create Ubuntu and Debian virtual "
 "machine guests."
 msgstr ""
 "<link xlink:href=\"https://launchpad.net/vmbuilder\">VMBuilder</link> (虚拟机"
 "生成器) 是一个可为不同 hypervisors 生成虚拟机镜像的命令行工具。Ubuntu 带的 "
 "VMBuilder 版本只能创建 Ubuntu 虚拟机。 Debian 带的 VMBuilder 版本能创建 "
 "Ubuntu 以及 Debian 虚拟机。"
 msgid ""
 "<link xlink:href=\"https://packer.io\"> Packer</link> is a tool for creating "
 "machine images for multiple platforms from a single source configuration."
 msgstr ""
 "<link xlink:href=\"https://packer.io\"> Packer</link> 是使用单一源配置生成不"
 "同平台虚拟机镜像的工具。"
 msgid "<literal>aki</literal>. An Amazon kernel image."
 msgstr "<literal>aki</literal>. Amazon 内核镜像。"
@@ -214,6 +304,18 @@ msgid ""
 "an AMI file, AKI file, and ARI file.<placeholder-1/>"
 msgstr "UEC（Ubuntu 企业云） 文件是一个包含了 AMI AKI ARI文件的tar包压缩文件。"
 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 "
 "GitHub at <link xlink:href=\"https://github.com/rackerjoe/oz-image-build/"
 "tree/master/templates\">rackerjoe/oz-image-build/templates</link>. Here's "
 "how you would create a CentOS 6.4 image with Oz."
 msgstr ""
 "完整的 Oz 示例 已经超出本文档范围，但是我们提供一个示例。你可以在 GitHub "
 "<link xlink:href=\"https://github.com/rackerjoe/oz-image-build/tree/master/"
 "templates\">rackerjoe/oz-image-build/templates</link>.查找到额外的 Oz 模板文"
 "件。下面演示了使用 Oz 如何创建 CentOS 6.4 镜像。"
 msgid ""
 "A kernel file that the hypervisor will load initially to boot the image. For "
 "a Linux machine, this would be a <emphasis>vmlinuz</emphasis> file."
@@ -255,6 +357,16 @@ msgstr "使用SSH 公钥访问虚拟机  (<package>cloud-init</package>)"
 msgid "Adds information about image formats, properties."
 msgstr "添加镜像格式，属性相关信息。"
 msgid ""
 "After Oz completes the initial OS install using the kickstart file, it "
 "customizes the image with an update. It also removes any reference to the "
 "eth0 device that libvirt creates while Oz does the customizing, as specified "
 "in the <literal>command</literal> section of the XML file."
 msgstr ""
 "在 Oz 使用kickstart文件完成系统初始安装后，它通过更新镜像内容来定制镜像文件。"
 "定制的过程它通过 在XML 文件中的 <literal>command</literal> 字段也删除任何关于"
 "eth0设备的信息。"
 msgid ""
 "After you exit, you can open a shell to complete manual configuration steps. "
 "Select <guibutton>Yes</guibutton> to make a few OpenStack-specific changes:"
@@ -303,6 +415,13 @@ msgstr ""
 msgid "Argument to qemu-img"
 msgstr "qemu-img 参数"
 msgid ""
 "As of this writing, there are no Oz packages for Ubuntu, so you will need to "
 "either install from the source or build your own .deb file."
 msgstr ""
 "在本文档编写时，没有针对 Ubuntu 的 Oz 安装包，因此你需要从源代码安装或者编译"
 "自己的.deb文件包。"
 msgid ""
 "As of this writing, we are not aware of other distributions that provide "
 "images for download."
@@ -543,6 +662,14 @@ msgstr "在额外的空间上创建 LVM 分区。例如：<placeholder-1/> 。"
 msgid "Create a new physical volume. For example, <placeholder-1/>."
 msgstr "创建新的物理卷(PV)。例如： <placeholder-1/> 。"
 msgid ""
 "Create a template file (we'll call it <filename>centos64.tdl</filename>) "
 "with the following contents. The only entry you will need to change is the "
 "<literal>&lt;rootpw&gt;</literal> contents."
 msgstr ""
 "使用以下内容创建模板文件（我们叫做 <filename>centos64.tdl</filename>）。你仅"
 "仅需要修改  <literal>&lt;rootpw&gt;</literal> 部分的内容。"
 msgid "Create images manually"
 msgstr "手动创建镜像"
@@ -598,6 +725,9 @@ msgstr "磁盘分区以及在启动时调整根分区大小 (<package>cloud-init
 msgid "Disk partitions and resize root partition on boot (cloud-init)"
 msgstr "磁盘分区以及在启动时调整根分区大小 (<package>cloud-init</package>)"
 msgid "Diskimage-builder"
 msgstr "镜像生成器"
 msgid ""
 "Do not attempt to use these tools to modify an image that is attached to a "
 "running virtual machine. These tools are designed to only modify images that "
@@ -721,6 +851,11 @@ msgstr ""
 "从启动时需要启动的服务列表中选择 <systemitem class=\"service\">ssh</"
 "systemitem> 。以及可选的其他服务。"
 msgid ""
 "Further customization could be accomplished by setting environment variables "
 "or adding elements to the command-line:"
 msgstr "更进一步的镜像定制可以通过设置环境变量或者添加元素到命令行："
 msgid "Get images"
 msgstr "获取镜像"
@@ -948,6 +1083,16 @@ msgstr ""
 "如果你不能使用libguestfs，你可以使用loop(环回)设备，kpartx,网络块设备直接挂载"
 "镜像文件系统到宿主机系统。<placeholder-1/>"
 msgid ""
 "If you leave out the <literal>-u</literal> flag, or you want to edit the "
 "file to do additional customizations, you can use the <placeholder-1/> "
 "command, using the libvirt XML file that <placeholder-2/> creates. For "
 "example:"
 msgstr ""
 "如果你忘记使用  <literal>-u</literal> 参数，或者你想编辑文件做额外的定制化，"
 "你可以使用 <placeholder-1/> 命令，来使用 <placeholder-2/> 创建的libvirt XML "
 "文件，例如："
 msgid ""
 "If you modify this example, the root partition, which is mounted on "
 "<filename>/</filename>, must be the last partition on the drive so that it "
@@ -1346,6 +1491,12 @@ msgstr "可选的，添加用户。"
 msgid "Oz"
 msgstr "Oz"
 msgid ""
 "Oz will invoke libvirt to boot the image inside of KVM, then Oz will ssh "
 "into the instance and perform the customizations."
 msgstr ""
 "Oz 将调用 libvirt 通过 KVM 来启动镜像，然后Oz ssh 到虚拟机内完成定制化工作。"
 msgid "Packer"
 msgstr "Packer"
@@ -1658,6 +1809,15 @@ msgstr ""
 "裸格式镜像和块设备文件是二进制位相当的，就好像从块设备拷贝过来的，比方说，使"
 "用<placeholder-1/> 命令将 <filename>/dev/sda</filename> 内容拷贝到一个文件。"
 msgid ""
 "The <link xlink:href=\"https://help.ubuntu.com/12.04/serverguide/jeos-and-"
 "vmbuilder.html\"><citetitle>Ubuntu Server Guide</citetitle></link> has "
 "documentation on how to use VMBuilder to create an Ubuntu image."
 msgstr ""
 "<link xlink:href=\"https://help.ubuntu.com/12.04/serverguide/jeos-and-"
 "vmbuilder.html\"><citetitle>Ubuntu Server Guide</citetitle></link> 编写了如何"
 "使用 VMBuilder 创建 Ubuntu 镜像。"
 msgid ""
 "The <literal>-X</literal> flag passed to ssh will enable X11 forwarding over "
 "ssh. If this does not work, try replacing it with the <literal>-Y</literal> "
@@ -1981,6 +2141,22 @@ msgstr ""
 "因此，如果你使用 Xen ，我们推荐当你创建镜像时，只建立一个 ext3 或者 ext4 分区"
 "（而且没有LVM管理）。否则，继续往下看。"
 msgid ""
 "This Oz template specifies where to download the Centos 6.4 install ISO. Oz "
 "will use the version information to identify which kickstart file to use. In "
 "this case, it will be <link xlink:href=\"https://github.com/clalancette/oz/"
 "blob/master/oz/auto/RHEL6.auto\">RHEL6.auto</link>. It adds EPEL as a "
 "repository and install the <literal>epel-release</literal>, <literal>cloud-"
 "utils</literal>, and <literal>cloud-init</literal> packages, as specified in "
 "the <literal>packages</literal> section of the file."
 msgstr ""
 "Oz 模板指定了 Centos 6.4 安装 ISO 的下载位置。 Oz 使用版本信息确认了使用哪一"
 "个 kickstart 文件。在这个示例中，是 <link xlink:href=\"https://github.com/"
 "clalancette/oz/blob/master/oz/auto/RHEL6.auto\">RHEL6.auto</link> 。它添加 "
 "EPEL 软件库，并且安装在 <literal>packages</literal> 字段指定的 <literal>epel-"
 "release</literal>, <literal>cloud-utils</literal>, 以及 <literal>cloud-init</"
 "literal> 包。"
 msgid "This VM must also have Internet access to download packages."
 msgstr "虚拟机必须能访问 Internet 以便下载软件包。"
@@ -1991,6 +2167,24 @@ msgstr ""
 "这个例子创建一个Windows Server 2012 qcow2镜像，使用<placeholder-1/>以及KVM虚"
 "拟化。"
 msgid ""
 "This example creates a generic, bootable Ubuntu image of the latest release."
 msgstr "这个示例创建了一个通用的，可启动的最新版本 Ubuntu 镜像。"
 msgid ""
 "This example creates the image as before, but for arm architecture. More "
 "elements are available in the <link xlink:href=\"https://github.com/"
 "openstack/diskimage-builder/tree/master/elements\">git source directory</"
 "link> and documented in the <link xlink:href=\"http://docs.openstack.org/"
 "developer/diskimage-builder/elements.html\">diskimage-builder elements "
 "documentation</link>."
 msgstr ""
 "这个示例使用之前创建的镜像，但是针对 ARM 结构，更多的基础元素参见 <link "
 "xlink:href=\"https://github.com/openstack/diskimage-builder/tree/master/"
 "elements\">git 源目录</link> 且文档参考 <link xlink:href=\"http://docs."
 "openstack.org/developer/diskimage-builder/elements.html\">镜像生成器基础元素"
 "文档。 "
 msgid ""
 "This example installs a Ubuntu 14.04 (Trusty Tahr) image. To create an image "
 "for a different version of Ubuntu, follow these steps with the noted "
@@ -2069,6 +2263,9 @@ msgstr ""
 "为了让<glossterm>Cloudbase-Init</glossterm>在系统启动时运行脚本，设置"
 "PowerShell执行策略解除限制。"
 msgid "To build an image, call the following script:"
 msgstr "要创建镜像，输入以下命令："
 msgid "To create a FreeBSD image"
 msgstr "创建 FreeBSD 镜像"
@@ -2109,6 +2306,9 @@ msgid ""
 "\"virtual machine image\"."
 msgstr "为了简化，有时文档使用 \"镜像\" 代替 \"虚拟机镜像\" 。"
 msgid "To run this:"
 msgstr "运行："
 msgid ""
 "To see how the settings affect the deletion of a running instance, check the "
 "directory where the images are stored:"
--- a/doc/networking-guide/source/locale/networking-guide.pot
+++ b/doc/networking-guide/source/locale/networking-guide.pot