You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2013/04/12 15:44:13 UTC

[1/3] [TRANSLATION]: Adding zh-CN translation strings

Updated Branches:
  refs/heads/4.1 959039c29 -> 3fe40aa1b


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/about-zones.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/about-zones.po b/docs/zh-CN/about-zones.po
index ded09c3..7b96a56 100644
--- a/docs/zh-CN/about-zones.po
+++ b/docs/zh-CN/about-zones.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:02\n"
-"PO-Revision-Date: 2013-02-02 18:32+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:37\n"
+"PO-Revision-Date: 2013-04-12 11:28+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -36,14 +36,14 @@ msgstr "关于资源域"
 #. Tag: para
 #, no-c-format
 msgid ""
-"A zone is the largest organizational unit within a &PRODUCT; deployment. A "
-"zone typically corresponds to a single datacenter, although it is "
-"permissible to have multiple zones in a datacenter. The benefit of "
+"A zone is the second largest organizational unit within a &PRODUCT; "
+"deployment. A zone typically corresponds to a single datacenter, although it"
+" is permissible to have multiple zones in a datacenter. The benefit of "
 "organizing infrastructure into zones is to provide physical isolation and "
 "redundancy. For example, each zone can have its own power supply and network"
 " uplink, and the zones can be widely separated geographically (though this "
 "is not required)."
-msgstr "资源域在&PRODUCT; 部署中是最大的组织单位。一个资源与通常对应于一个数据中心,但是一个数据中心中也允许有多个资源域。以资源与的方组织设备有利于提供物理隔离和冗余。比如,每个资源域可以有自己的电源和上行链路网络,同事各个资源域可以广泛的分布于不同的地理位置(虽然这不是必需的)。"
+msgstr ""
 
 #. Tag: para
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/added-API-commands.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/added-API-commands.po b/docs/zh-CN/added-API-commands.po
index 787938b..08a1d91 100644
--- a/docs/zh-CN/added-API-commands.po
+++ b/docs/zh-CN/added-API-commands.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:02\n"
-"PO-Revision-Date: 2013-02-02 18:33+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:37\n"
+"PO-Revision-Date: 2013-04-12 11:29+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -172,8 +172,8 @@ msgstr "listProjects (列出项目详细信息)"
 
 #. Tag: para
 #, no-c-format
-msgid "addAccountToProject (Adds acoount to a project)"
-msgstr "addAccountToProject (向项目中添加账户)"
+msgid "addAccountToProject (Adds account to a project)"
+msgstr ""
 
 #. Tag: para
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/api-reference.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/api-reference.po b/docs/zh-CN/api-reference.po
index 19182c1..0fff722 100644
--- a/docs/zh-CN/api-reference.po
+++ b/docs/zh-CN/api-reference.po
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:02\n"
-"PO-Revision-Date: 2013-02-02 18:34+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:34+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -41,5 +41,5 @@ msgstr ""
 #, no-c-format
 msgid ""
 "<ulink "
-"url=\"http://incubator.apache.org/cloudstack/docs/api/\">http://incubator.apache.org/cloudstack/docs/api/</ulink>"
+"url=\"http://cloudstack.apache.org/docs/api/\">http://cloudstack.apache.org/docs/api/</ulink>"
 msgstr ""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/build-rpm.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/build-rpm.po b/docs/zh-CN/build-rpm.po
index 80d8067..3c2af33 100644
--- a/docs/zh-CN/build-rpm.po
+++ b/docs/zh-CN/build-rpm.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:02\n"
-"PO-Revision-Date: 2013-03-19 14:04+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:35+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -157,15 +157,51 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
+msgid "You should see six RPMs in that directory:"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<filename>cloudstack-agent-4.1.0.el6.x86_64.rpm</filename>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<filename>cloudstack-awsapi-4.1.0.el6.x86_64.rpm</filename>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<filename>cloudstack-cli-4.1.0.el6.x86_64.rpm</filename>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<filename>cloudstack-common-4.1.0.el6.x86_64.rpm</filename>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<filename>cloudstack-management-4.1.0.el6.x86_64.rpm</filename>"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "<filename>cloudstack-usage-4.1.0.el6.x86_64.rpm</filename>"
+msgstr ""
+
+#. Tag: title
+#, no-c-format
+msgid "Filename Variations"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid ""
-"You should see seven RPMs in that directory: <filename>cloudstack-"
-"agent-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-"
-"awsapi-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-"
-"cli-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-"
-"common-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-"
-"docs-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-"
-"management-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, and <filename"
-">cloudstack-usage-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>."
+"The file names may vary slightly. For instance, if you were to build the "
+"RPMs on a Fedora 18 system, you'd see \"fc18\" instead of \"el6\" in the "
+"filename. (Fedora 18 isn't a supported platform at this time, just providing"
+" an example.)"
 msgstr ""
 
 #. Tag: title

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/building-marvin.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/building-marvin.po b/docs/zh-CN/building-marvin.po
index 24b3623..5c1700c 100644
--- a/docs/zh-CN/building-marvin.po
+++ b/docs/zh-CN/building-marvin.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:02\n"
-"PO-Revision-Date: 2013-03-19 14:04+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:35+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -53,11 +53,11 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid ""
-"If successfull the build will have created the cloudstackAPI Python package "
+"If successful the build will have created the cloudstackAPI Python package "
 "under tools/marvin/marvin/cloudstackAPI as well as a gziped Marvin package "
 "under tools/marvin dist. To install the Python Marvin module do the "
 "following in tools/marvin:"
-msgstr "如果编译成功,cloudstackAPI Python包将会在 tools/marvin/marvin/cloudstackAPI下创建, 同时一个Marvin gzip包会生成在 tools/marvin/dist下. 要安装Python Marvin模块, 在tools/marvin目录下执行下面的命令:"
+msgstr ""
 
 #. Tag: programlisting
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/building-with-maven-steps.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/building-with-maven-steps.po b/docs/zh-CN/building-with-maven-steps.po
index 9e37ae8..017accd 100644
--- a/docs/zh-CN/building-with-maven-steps.po
+++ b/docs/zh-CN/building-with-maven-steps.po
@@ -18,9 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:02\n"
-"PO-Revision-Date: 2013-02-13 02:37+0000\n"
-"Last-Translator: Gavin Lee <ga...@gmail.com>\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:35+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,9 +42,8 @@ msgstr "&PRODUCT; 使用git进行源码版本控制, 首先确保你将源码都
 
 #. Tag: programlisting
 #, no-c-format
-msgid ""
-"git clone https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git"
-msgstr "git clone https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git"
+msgid "git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git"
+msgstr ""
 
 #. Tag: para
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/citrix-xenserver-installation.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/citrix-xenserver-installation.po b/docs/zh-CN/citrix-xenserver-installation.po
index e3b419e..5860293 100644
--- a/docs/zh-CN/citrix-xenserver-installation.po
+++ b/docs/zh-CN/citrix-xenserver-installation.po
@@ -19,8 +19,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-03-19 14:05+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:36+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -99,8 +99,8 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid ""
-"All hosts within a cluster must be homogenous. The CPUs must be of the same "
-"type, count, and feature flags."
+"All hosts within a cluster must be homogeneous. The CPUs must be of the same"
+" type, count, and feature flags."
 msgstr ""
 
 #. Tag: para
@@ -871,7 +871,7 @@ msgid ""
 "devices must be pingable from the management network NIC or bond. If a "
 "secondary storage device has been placed on the storage network, it must "
 "also be pingable via the storage network NIC or bond on the hosts as well."
-msgstr "为了让单独的存储网络工作正常,主机上对应存储网络的接口必须是能ping通主存储设备IP地址的唯一接口。例如,如果eth0是内网网卡,ping -I eth0 <replaceable>primary storage IP</replaceable> 必须失败。在所有部署的主机上,二级存储设备必须可通过内网网卡或对应的绑定网卡ping通。如果二级存储设备在存储网络中,则通过存储网络对应网卡或绑定网卡也必须可以ping通。"
+msgstr "为了让单独的存储网络工作正常,主机上对应存储网络的接口必须是能ping通主存储设备IP地址的唯一接口。例如,如果eth0是内网网卡,ping -I eth0 <primary storage device IP>必须失败。在所有部署的主机上,二级存储设备必须可通过内网网卡或对应的绑定网卡ping通。如果二级存储设备在存储网络中,则通过存储网络对应网卡或绑定网卡也必须可以ping通。"
 
 #. Tag: para
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/cloudmonkey.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/cloudmonkey.po b/docs/zh-CN/cloudmonkey.po
index d2076b2..cda8587 100644
--- a/docs/zh-CN/cloudmonkey.po
+++ b/docs/zh-CN/cloudmonkey.po
@@ -17,9 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-03-19 14:14+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:47+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgid ""
 "CloudMonkey is the &PRODUCT; Command Line Interface (CLI). It is written in "
 "Python. CloudMonkey can be used both as an interactive shell and as a "
 "command line tool which simplifies &PRODUCT; configuration and management. "
-"It can be used with &PRODUCT; CloudStack 4.0-incubating and above"
+"It can be used with &PRODUCT; releases since the 4.0.x branch."
 msgstr ""
 
 #. Tag: para
@@ -91,7 +91,7 @@ msgstr ""
 msgid ""
 "\n"
 "    \n"
-"$ git clone https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git # (optional if using a release download)\n"
+"$ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git # (optional if using a release download)\n"
 "$ mvn clean install -P developer\n"
 "$ cd tools/cli # cloudmonkey-x.x.x.tar.gz will be built in dist\n"
 "$ python setup.py build\n"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/configure-vpn.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/configure-vpn.po b/docs/zh-CN/configure-vpn.po
index 39eabae..b91dcd2 100644
--- a/docs/zh-CN/configure-vpn.po
+++ b/docs/zh-CN/configure-vpn.po
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-03-19 14:06+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:36+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr ""
 #. Tag: para
 #, no-c-format
 msgid ""
-"remote.access.vpn.client.ip.range – The range of IP addressess to be "
+"remote.access.vpn.client.ip.range – The range of IP addresses to be "
 "allocated to remote access VPN clients. The first IP in the range is used by"
 " the VPN server."
 msgstr ""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/console-proxy.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/console-proxy.po b/docs/zh-CN/console-proxy.po
index da7ebc6..079a4b4 100644
--- a/docs/zh-CN/console-proxy.po
+++ b/docs/zh-CN/console-proxy.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-03-19 14:06+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:38\n"
+"PO-Revision-Date: 2013-04-12 11:36+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -189,7 +189,8 @@ msgstr ""
 #. Tag: programlisting
 #, no-c-format
 msgid ""
-"openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encryped.key"
+"openssl pkcs8 -topk8 -in yourprivate.key -out "
+"yourprivate.pkcs8.encrypted.key"
 msgstr ""
 
 #. Tag: para

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/feature-overview.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/feature-overview.po b/docs/zh-CN/feature-overview.po
index 1261ca9..4d834d2 100644
--- a/docs/zh-CN/feature-overview.po
+++ b/docs/zh-CN/feature-overview.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-02-02 18:41+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:39\n"
+"PO-Revision-Date: 2013-04-12 11:38+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,7 @@ msgstr "&PRODUCT;能做什么?"
 #. Tag: para
 #, no-c-format
 msgid "<emphasis role=\"bold\">Multiple Hypervisor Support</emphasis>"
-msgstr "<emphasis>多种Hypervisor支持</emphasis>"
+msgstr "<emphasis role=\"bold\">多种Hypervisor支持</emphasis>"
 
 #. Tag: para
 #, no-c-format
@@ -52,7 +52,7 @@ msgstr ""
 msgid ""
 "<emphasis role=\"bold\">Massively Scalable Infrastructure "
 "Management</emphasis>"
-msgstr "<emphasis>大规模可扩展的管理架构</emphasis>"
+msgstr "<emphasis role=\"bold\">大规模可扩展的管理架构</emphasis>"
 
 #. Tag: para
 #, no-c-format
@@ -68,7 +68,7 @@ msgstr "&PRODUCT;可以管理数万台服务器; 这些服务器可以部署在
 #. Tag: para
 #, no-c-format
 msgid "<emphasis role=\"bold\">Automatic Configuration Management</emphasis>"
-msgstr "<emphasis>自动化配置管理</emphasis>"
+msgstr "<emphasis role=\\\"bold\\\">自动化配置管理</emphasis>"
 
 #. Tag: para
 #, no-c-format
@@ -90,7 +90,7 @@ msgstr "&PRODUCT;内部提供的虚拟设备池用来支持云平台自身功能
 #. Tag: para
 #, no-c-format
 msgid "<emphasis role=\"bold\">Graphical User Interface</emphasis>"
-msgstr "<emphasis>图形用户界面</emphasis>"
+msgstr "<emphasis role=\\\"bold\\\">图形用户界面</emphasis>"
 
 #. Tag: para
 #, no-c-format
@@ -104,7 +104,7 @@ msgstr "&PRODUCT;提供了管理员Web接口, 用来供应和管理整个云平
 #. Tag: para
 #, no-c-format
 msgid "<emphasis role=\"bold\">API and Extensibility</emphasis>"
-msgstr "<emphasis>API及其扩展性</emphasis>"
+msgstr "<emphasis role=\\\"bold\\\">API及其扩展性</emphasis>"
 
 #. Tag: para
 #, no-c-format
@@ -113,10 +113,9 @@ msgid ""
 "management features available in the UI. The API is maintained and "
 "documented. This API enables the creation of command line tools and new user"
 " interfaces to suit particular needs. See the Developer’s Guide and API "
-"Reference, both available at <ulink "
-"url=\"http://incubator.apache.org/cloudstack/docs\">Apache CloudStack "
-"Guides</ulink> and <ulink "
-"url=\"http://incubator.apache.org/cloudstack/docs/api\">Apache CloudStack "
+"Reference, both available at <ulink url=\"http://cloudstack.apache.org/docs"
+"/en-US/index.html\">Apache CloudStack Guides</ulink> and <ulink "
+"url=\"http://cloudstack.apache.org/docs/api/index.html\">Apache CloudStack "
 "API Reference</ulink> respectively."
 msgstr ""
 
@@ -132,7 +131,7 @@ msgstr "&PRODUCT; 可插拨的allocation架构允许对选择的存储和主机
 #. Tag: para
 #, no-c-format
 msgid "<emphasis role=\"bold\">High Availability</emphasis>"
-msgstr "<emphasis >高可用性</emphasis>"
+msgstr "<emphasis role=\\\"bold\\\">高可用性</emphasis>"
 
 #. Tag: para
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/getting-release.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/getting-release.po b/docs/zh-CN/getting-release.po
index 1ac2aff..9eab0d6 100644
--- a/docs/zh-CN/getting-release.po
+++ b/docs/zh-CN/getting-release.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-03-19 14:07+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:39\n"
+"PO-Revision-Date: 2013-04-12 11:38+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -37,15 +37,15 @@ msgstr "获得发行版"
 #, no-c-format
 msgid ""
 "You can download the latest &PRODUCT; release from the <ulink "
-"url=\"http://incubator.apache.org/cloudstack/downloads.html\"> Apache "
-"CloudStack project download page</ulink>."
-msgstr "你可以从 <ulink url=\"http://incubator.apache.org/cloudstack/downloads.html\"> Apache CloudStack project download page</ulink>下载最新的&PRODUCT; "
+"url=\"http://cloudstack.apache.org/downloads.html\"> Apache CloudStack "
+"project download page</ulink>."
+msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Prior releases are available via archive.apache.org at <ulink "
-"url=\"http://archive.apache.org/dist/incubator/cloudstack/releases/\">http://archive.apache.org/dist/incubator/cloudstack/releases/</ulink>."
+"Prior releases are available via archive.apache.org as well. See the "
+"downloads page for more information on archived releases."
 msgstr ""
 
 #. Tag: para

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/global-config.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/global-config.po b/docs/zh-CN/global-config.po
index ca8f58b..0e3ec96 100644
--- a/docs/zh-CN/global-config.po
+++ b/docs/zh-CN/global-config.po
@@ -18,9 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-02-20 14:58+0000\n"
-"Last-Translator: typuc <ty...@163.com>\n"
+"POT-Creation-Date: 2013-04-12T11:19:39\n"
+"PO-Revision-Date: 2013-04-12 11:40+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,6 +30,11 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
+msgid "Global Configuration Parameters"
+msgstr ""
+
+#. Tag: title
+#, no-c-format
 msgid "Setting Global Configuration Parameters"
 msgstr "设置全局配置参数"
 
@@ -83,3 +88,154 @@ msgid ""
 "Capabilities, you must click the name of the hypervisor first to display the"
 " editing screen."
 msgstr "单击“编辑”图标修改一个值。如果您正在查看的hypervsior容量,您必须单击hypervsior第一次显示编辑屏幕的名称。"
+
+#. Tag: title
+#, no-c-format
+msgid "About Global Configuration Parameters"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"&PRODUCT; provides a variety of settings you can use to set limits, "
+"configure features, and enable or disable features in the cloud. Once your "
+"Management Server is running, you might need to set some of these global "
+"configuration parameters, depending on what optional features you are "
+"setting up."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"To modify global configuration parameters, use the steps in \"Setting Global"
+" Configuration Parameters.\""
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The documentation for each &PRODUCT; feature should direct you to the names "
+"of the applicable parameters. Many of them are discussed in the &PRODUCT; "
+"Administration Guide. The following table shows a few of the more useful "
+"parameters."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Field"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "Value"
+msgstr "值"
+
+#. Tag: para
+#, no-c-format
+msgid "management.network.cidr"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"A CIDR that describes the network that the management CIDRs reside on. This "
+"variable must be set for deployments that use vSphere. It is recommended to "
+"be set for other deployments as well. Example: 192.168.3.0/24."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "xen.setup.multipath"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"For XenServer nodes, this is a true/false variable that instructs CloudStack"
+" to enable iSCSI multipath on the XenServer Hosts when they are added. This "
+"defaults to false. Set it to true if you would like CloudStack to enable "
+"multipath."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"If this is true for a NFS-based deployment multipath will still be enabled "
+"on the XenServer host. However, this does not impact NFS operation and is "
+"harmless."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "secstorage.allowed.internal.sites"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This is used to protect your internal network from rogue attempts to "
+"download arbitrary files using the template download feature. This is a "
+"comma-separated list of CIDRs. If a requested URL matches any of these CIDRs"
+" the Secondary Storage VM will use the private network interface to fetch "
+"the URL. Other URLs will go through the public interface. We suggest you set"
+" this to 1 or 2 hardened internal machines where you keep your templates. "
+"For example, set it to 192.168.1.66/32."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "use.local.storage"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Determines whether CloudStack will use storage that is local to the Host for"
+" data disks, templates, and snapshots. By default CloudStack will not use "
+"this storage. You should change this to true if you want to use local "
+"storage and you understand the reliability and feature drawbacks to choosing"
+" local storage."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "host"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"This is the IP address of the Management Server. If you are using multiple "
+"Management Servers you should enter a load balanced IP address that is "
+"reachable via the private network."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "default.page.size"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Maximum number of items per page that can be returned by a CloudStack API "
+"command. The limit applies at the cloud level and can vary from cloud to "
+"cloud. You can override this with a lower value on a particular API call by "
+"using the page and pagesize API command parameters. For more information, "
+"see the Developer's Guide. Default: 500."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid "ha.tag"
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"The label you want to use throughout the cloud to designate certain hosts as"
+" dedicated HA hosts. These hosts will be used only for HA-enabled VMs that "
+"are restarting due to the failure of another host. For example, you could "
+"set this to ha_host. Specify the ha.tag value as a host tag when you add a "
+"new host to the cloud."
+msgstr ""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/guest-nw-usage-with-traffic-sentinel.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/guest-nw-usage-with-traffic-sentinel.po b/docs/zh-CN/guest-nw-usage-with-traffic-sentinel.po
index 86a3ca4..baabd4a 100644
--- a/docs/zh-CN/guest-nw-usage-with-traffic-sentinel.po
+++ b/docs/zh-CN/guest-nw-usage-with-traffic-sentinel.po
@@ -17,9 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:03\n"
-"PO-Revision-Date: 2013-02-02 18:41+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2013-04-12T11:19:39\n"
+"PO-Revision-Date: 2013-04-12 11:39+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -103,7 +103,7 @@ msgid ""
 "command addTrafficMonitor. Pass in the URL of the Traffic Sentinel as "
 "protocol + host + port (optional); for example, http://10.147.28.100:8080. "
 "For the addTrafficMonitor command syntax, see the API Reference at <ulink "
-"url=\"http://incubator.apache.org/cloudstack/docs/api/index.html\">API "
+"url=\"http://cloudstack.apache.org/docs/api/index.html\">API "
 "Documentation</ulink>."
 msgstr ""
 
@@ -111,9 +111,8 @@ msgstr ""
 #, no-c-format
 msgid ""
 "For information about how to call the &PRODUCT; API, see the Developer’s "
-"Guide at <ulink url=\"http://incubator.apache.org/cloudstack/docs/en-"
-"US/Apache_CloudStack/4.0.0-incubating/html/API_Developers_Guide/index.html\">CloudStack"
-" API Developer's Guide</ulink>."
+"Guide at <ulink url=\"http://cloudstack.apache.org/docs/en-US/index.html\"> "
+"&PRODUCT; API Developer's Guide</ulink>."
 msgstr ""
 
 #. Tag: para

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/hypervisor-host-install-libvirt.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/hypervisor-host-install-libvirt.po b/docs/zh-CN/hypervisor-host-install-libvirt.po
index 5c7769a..ac3cab8 100644
--- a/docs/zh-CN/hypervisor-host-install-libvirt.po
+++ b/docs/zh-CN/hypervisor-host-install-libvirt.po
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-03-19 14:08+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:39\n"
+"PO-Revision-Date: 2013-04-12 11:39+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/ip-forwarding-firewalling.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/ip-forwarding-firewalling.po b/docs/zh-CN/ip-forwarding-firewalling.po
index 48b8365..8a01473 100644
--- a/docs/zh-CN/ip-forwarding-firewalling.po
+++ b/docs/zh-CN/ip-forwarding-firewalling.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-03-19 14:08+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:39\n"
+"PO-Revision-Date: 2013-04-12 11:40+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -37,9 +37,15 @@ msgstr "IP转发及防火墙"
 #, no-c-format
 msgid ""
 "By default, all incoming traffic to the public IP address is rejected. All "
-"outgoing traffic from the guests is translated via NAT to the public IP "
-"address and is allowed."
-msgstr "默认情况下, 所有在公共IP接收的流量都会被拒绝. 所有在客户网络经由NAT到公共网络的流量都被允许."
+"outgoing traffic from the guests is also blocked by default."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"To allow outgoing traffic, follow the procedure in <xref linkend=\"egress-"
+"firewall-rule\" />."
+msgstr ""
 
 #. Tag: para
 #, no-c-format
@@ -50,5 +56,6 @@ msgid ""
 "forwarding rules to direct traffic from individual ports within that range "
 "to specific ports on user VMs. For example, one port forwarding rule could "
 "route incoming traffic on the public IP's port 33 to port 100 on one user "
-"VM's private IP."
-msgstr "为了允许接收到的流量, 用户可以设置一些防火墙规则和/或端口转发规则. 例如, 你可以在公共IP地址上设定防火墙规则来打开一个端口范围, 比如从33到44端口. 然后使用端口转发将流量从这个特定的范围内的端口直接送到指定的用户虚机端口. 例如, 一个端口转发的规则可以将接收的流量从公共IP的33端口到用户虚机私有IP的100端口."
+"VM's private IP. For more information, see <xref linkend=\"firewall-rules\" "
+"/> and <xref linkend=\"port-forwarding\" />."
+msgstr ""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/management-server-install-prepare-os.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/management-server-install-prepare-os.po b/docs/zh-CN/management-server-install-prepare-os.po
index 0db1a92..bb14bcf 100644
--- a/docs/zh-CN/management-server-install-prepare-os.po
+++ b/docs/zh-CN/management-server-install-prepare-os.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-02-02 18:44+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:40\n"
+"PO-Revision-Date: 2013-04-12 11:41+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -59,9 +59,9 @@ msgstr "hostname --fqdn"
 #, no-c-format
 msgid ""
 "This should return a fully qualified hostname such as "
-"\"managament1.lab.example.org\". If it does not, edit /etc/hosts so that it "
+"\"management1.lab.example.org\". If it does not, edit /etc/hosts so that it "
 "does."
-msgstr "这将会返回一个全称域名例如\"managament1.lab.example.org\". 如果不是这样, 请编辑/etc/hosts使其返回类似的结果."
+msgstr ""
 
 #. Tag: para
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/management-server-lb.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/management-server-lb.po b/docs/zh-CN/management-server-lb.po
index 6e999ac..e1c7ff6 100644
--- a/docs/zh-CN/management-server-lb.po
+++ b/docs/zh-CN/management-server-lb.po
@@ -17,9 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-02-02 18:44+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2013-04-12T11:19:40\n"
+"PO-Revision-Date: 2013-04-12 11:41+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,7 +29,7 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Setting Zone VLAN and Running VM Maximums"
+msgid "Management Server Load Balancing"
 msgstr ""
 
 #. Tag: para
@@ -112,3 +112,14 @@ msgstr ""
 #, no-c-format
 msgid "No"
 msgstr "否"
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"In addition to above settings, the administrator is responsible for setting "
+"the 'host' global config value from the management server IP to load "
+"balancer virtual IP address. If the 'host' value is not set to the VIP for "
+"Port 8250 and one of your management servers crashes, the UI is still "
+"available but the system VMs will not be able to contact the management "
+"server."
+msgstr ""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/minimum-system-requirements.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/minimum-system-requirements.po b/docs/zh-CN/minimum-system-requirements.po
index ba693db..cae2c87 100644
--- a/docs/zh-CN/minimum-system-requirements.po
+++ b/docs/zh-CN/minimum-system-requirements.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-03-19 14:18+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:40\n"
+"PO-Revision-Date: 2013-04-12 11:41+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -137,8 +137,8 @@ msgstr "部署&PRODUCT;时宿主机务必不能有任何运行中的虚拟机。
 #. Tag: para
 #, no-c-format
 msgid ""
-"All hosts within a cluster must be homogenous. The CPUs must be of the same "
-"type, count, and feature flags."
+"All hosts within a cluster must be homogeneous. The CPUs must be of the same"
+" type, count, and feature flags."
 msgstr ""
 
 #. Tag: para

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/provisioning-steps-overview.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/provisioning-steps-overview.po b/docs/zh-CN/provisioning-steps-overview.po
index e36ef2a..aae003c 100644
--- a/docs/zh-CN/provisioning-steps-overview.po
+++ b/docs/zh-CN/provisioning-steps-overview.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-03-19 14:10+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:40\n"
+"PO-Revision-Date: 2013-04-12 11:43+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -51,33 +51,45 @@ msgstr "为了提供云基础架构, 或者在任何时个需要扩展过规模,
 
 #. Tag: para
 #, no-c-format
-msgid "Add a zone. See <xref linkend=\"zone-add\" />."
-msgstr "添加一个资源域. 参照 <xref linkend=\"zone-add\" />."
+msgid "Define regions (optional). See <xref linkend=\"region-add\" />."
+msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Add more pods (optional). See <xref linkend=\"pod-add\" />."
-msgstr "添加更多机架 (可选). 参照<xref linkend=\"pod-add\" />."
+msgid "Add a zone to the region. See <xref linkend=\"zone-add\" />."
+msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Add more clusters (optional). See <xref linkend=\"cluster-add\" />."
-msgstr "添加更多集群 (可选). 参照<xref linkend=\"cluster-add\" />."
+msgid "Add more pods to the zone (optional). See <xref linkend=\"pod-add\" />."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
+msgid ""
+"Add more clusters to the pod (optional). See <xref linkend=\"cluster-add\" "
+"/>."
+msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Add more hosts (optional). See <xref linkend=\"host-add\" />."
-msgstr "添加更多主机 (可选). 参照<xref linkend=\"host-add\" />."
+msgid ""
+"Add more hosts to the cluster (optional). See <xref linkend=\"host-add\" />."
+msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Add primary storage. See <xref linkend=\"primary-storage-add\" />."
-msgstr "添加主存储. 参照<xref linkend=\"primary-storage-add\" />."
+msgid ""
+"Add primary storage to the cluster. See <xref linkend=\"primary-storage-"
+"add\" />."
+msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Add secondary storage. See <xref linkend=\"secondary-storage-add\" />."
-msgstr "添加二级存储. 参照<xref linkend=\"secondary-storage-add\" />."
+msgid ""
+"Add secondary storage to the zone. See <xref linkend=\"secondary-storage-"
+"add\" />."
+msgstr ""
 
 #. Tag: para
 #, no-c-format

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/provisioning-steps.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/provisioning-steps.po b/docs/zh-CN/provisioning-steps.po
index 58f812a..1e40fae 100644
--- a/docs/zh-CN/provisioning-steps.po
+++ b/docs/zh-CN/provisioning-steps.po
@@ -17,9 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2012-12-19 09:42+0000\n"
-"Last-Translator: tiansiyuan <ti...@gmail.com>\n"
+"POT-Creation-Date: 2013-04-12T11:19:40\n"
+"PO-Revision-Date: 2013-04-12 11:43+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,8 @@ msgstr "准备你的云基础设施的步骤"
 #. Tag: para
 #, no-c-format
 msgid ""
-"This section tells how to add zones, pods, clusters, hosts, storage, and "
-"networks to your cloud. If you are unfamiliar with these entities, please "
-"begin by looking through <xref linkend=\"cloud-infrastructure-concepts\" />."
-msgstr "本节讲述如何增加区,POD,集群,主机,存储和网络到你的云中。如果你不熟细这些实体, 请先阅读<xref linkend=\"cloud-infrastructure-concepts\" />。"
+"This section tells how to add regions, zones, pods, clusters, hosts, "
+"storage, and networks to your cloud. If you are unfamiliar with these "
+"entities, please begin by looking through <xref linkend=\"cloud-"
+"infrastructure-concepts\" />."
+msgstr ""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/remove-vpc.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/remove-vpc.po b/docs/zh-CN/remove-vpc.po
index 02bee09..e83b28b 100644
--- a/docs/zh-CN/remove-vpc.po
+++ b/docs/zh-CN/remove-vpc.po
@@ -17,9 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-02-02 20:45+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2013-04-12T11:19:40\n"
+"PO-Revision-Date: 2013-04-12 11:43+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,5 +88,5 @@ msgid ""
 "To restart a VPC, select the VPC, then click the Restart "
 "button.<inlinemediaobject> <imageobject> <imagedata fileref=\"./images"
 "/restart-vpc.png\" /> </imageobject> <textobject> <phrase>restart-vpc.png: "
-"button to restart a VPC</phrase> </textobject> </inlinemediaobject>"
+"button to restart a VPC</phrase> </textobject> </inlinemediaobject>i"
 msgstr ""

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/response-formats.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/response-formats.po b/docs/zh-CN/response-formats.po
index 15ff84d..613f8a6 100644
--- a/docs/zh-CN/response-formats.po
+++ b/docs/zh-CN/response-formats.po
@@ -18,9 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:04\n"
-"PO-Revision-Date: 2013-01-05 05:18+0000\n"
-"Last-Translator: Gavin Lee <ga...@gmail.com>\n"
+"POT-Creation-Date: 2013-04-12T11:19:40\n"
+"PO-Revision-Date: 2013-04-12 11:43+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,6 +43,16 @@ msgstr "&PRODUCT;API调用支持两种格式的响应. 默认响应格式是XML.
 
 #. Tag: para
 #, no-c-format
+msgid ""
+"The two response formats differ in how they handle blank fields. In JSON, if"
+" there is no value for a response field, it will not appear in the response."
+" If all the fields were empty, there might be no response at all. In XML, "
+"even if there is no value to be returned, an empty field will be returned as"
+" a placeholder XML element."
+msgstr ""
+
+#. Tag: para
+#, no-c-format
 msgid "Sample XML Response:"
 msgstr "XML响应样例"
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/vmware-install.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/vmware-install.po b/docs/zh-CN/vmware-install.po
index a478844..bd8a12c 100644
--- a/docs/zh-CN/vmware-install.po
+++ b/docs/zh-CN/vmware-install.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:05\n"
+"POT-Creation-Date: 2013-04-12T11:19:41\n"
 "PO-Revision-Date: 2013-02-02 20:50+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: None\n"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/vmware-requirements.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/vmware-requirements.po b/docs/zh-CN/vmware-requirements.po
index 49f12d7..02adb93 100644
--- a/docs/zh-CN/vmware-requirements.po
+++ b/docs/zh-CN/vmware-requirements.po
@@ -17,9 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:05\n"
-"PO-Revision-Date: 2013-02-02 20:50+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2013-04-12T11:19:41\n"
+"PO-Revision-Date: 2013-04-12 11:46+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -218,7 +218,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "All hosts must be 64-bit and must support HVM (Intel-VT or AMD-V enabled). "
-"All hosts within a cluster must be homogenous. That means the CPUs must be "
+"All hosts within a cluster must be homogeneous. That means the CPUs must be "
 "of the same type, count, and feature flags."
 msgstr ""
 


[2/3] [TRANSLATION]: Adding zh-CN translation strings

Posted by se...@apache.org.
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/Release_Notes.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/Release_Notes.po b/docs/zh-CN/Release_Notes.po
index 68eb08e..5e471b6 100644
--- a/docs/zh-CN/Release_Notes.po
+++ b/docs/zh-CN/Release_Notes.po
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:01\n"
-"PO-Revision-Date: 2013-03-19 14:02+0000\n"
+"POT-Creation-Date: 2013-04-12T11:19:37\n"
+"PO-Revision-Date: 2013-04-12 11:28+0000\n"
 "Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -29,5270 +29,2363 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Submitting Feedback and Getting Help"
+msgid "Welcome to &PRODUCT; 4.1"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The Apache CloudStack project has mailing lists for users and developers. "
-"These are the official channels of communication for the project and are the"
-" best way to get answers about using and contributing to CloudStack. It's a "
-"good idea to subscribe to the cloudstack-users mailing list if you've "
-"deployed or are deploying CloudStack into production, and even for test "
-"deployments."
+"Welcome to the 4.1.0 release of &PRODUCT;, the first major release from the "
+"Apache CloudStack project since its graduation from the Apache Incubator."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The CloudStack developer's mailing list (cloudstack-dev) is for discussions "
-"about CloudStack development, and is the best list for discussing possible "
-"bugs in CloudStack. Anyone contributing to CloudStack should be on this "
-"mailing list."
+"This document contains information specific to this release of &PRODUCT;, "
+"including upgrade instructions from prior releases, new features added to "
+"&PRODUCT;, API changes, and issues fixed in the release. For installation "
+"instructions, please see the <ulink url=\"http://cloudstack.apache.org/docs"
+"/en-"
+"US/Apache_CloudStack/4.1.0/html/Installation_Guide/index.html\">Installation"
+" Guide</ulink>. For usage and administration instructions, please see the "
+"<ulink url=\"http://cloudstack.apache.org/docs/en-"
+"US/Apache_CloudStack/4.1.0/html/Admin_Guide/index.html\">&PRODUCT; "
+"Administrator's Guide</ulink>. Developers and users who wish to work with "
+"the API will find instruction in the <ulink "
+"url=\"http://cloudstack.apache.org/docs/en-"
+"US/Apache_CloudStack/4.0.1-incubating/html/API_Developers_Guide/index.html\">&PRODUCT;"
+" API Developer's Guide</ulink>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can also report bugs in CloudStack using the <ulink "
-"url=\"https://issues.apache.org/jira/secure/CreateIssue!default.jspa\">Apache"
-" Defect Tracking System</ulink>."
+"If you find any errors or problems in this guide, please see <xref "
+"linkend=\"feedback\" />. We hope you enjoy working with &PRODUCT;!"
 msgstr ""
 
-#. Tag: para
-#, no-c-format
-msgid ""
-"To posts to the lists, you'll need to be subscribed. See the <ulink "
-"url=\"http://incubator.apache.org/cloudstack/mailing-lists.html\">CloudStack"
-" Web site</ulink> for instructions."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Upgrade Instructions"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Upgrade from 3.0.2 to 4.0.0-incubating"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Perform the following to upgrade from version 3.0.2 to version "
-"4.0.0-incubating. Note that some of the steps here are only required if "
-"you're using a specific hypervisor. The steps that are hypervisor-specific "
-"are called out with a note."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Ensure that you query your IP address usage records and process them or make"
-" a backup. During the upgrade you will lose the old IP address usage "
-"records."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Starting in 3.0.2, the usage record format for IP addresses is the same as "
-"the rest of the usage types. Instead of a single record with the assignment "
-"and release dates, separate records are generated per aggregation period "
-"with start and end dates. After upgrading, any existing IP address usage "
-"records in the old format will no longer be available."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The following upgrade instructions apply only if you're using VMware hosts. "
-"If you're not using VMware hosts, skip this step and move on to step 3: "
-"stopping all usage servers."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In each zone that includes VMware hosts, you need to add a new system VM "
-"template."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"While running the existing 3.0.2 system, log in to the UI as root "
-"administrator."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "In the left navigation bar, click Templates."
-msgstr "在左边的导航栏,点击模板。"
-
-#. Tag: para
-#, no-c-format
-msgid "In Select view, click Templates."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Click Register template."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The Register template dialog box is displayed."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In the Register template dialog box, specify the following values (do not "
-"change these):"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Field"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Value"
-msgstr "值"
-
-#. Tag: para
-#, no-c-format
-msgid "Name"
-msgstr "名称"
-
-#. Tag: para
-#, no-c-format
-msgid "systemvm-vmware-4.0"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Description"
-msgstr "说明"
-
-#. Tag: para
-#, no-c-format
-msgid "URL"
-msgstr "URL"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Zone"
-msgstr "区域"
-
-#. Tag: para
-#, no-c-format
-msgid "Choose the zone where this hypervisor is used"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Hypervisor"
-msgstr "虚拟机平台"
-
-#. Tag: para
-#, no-c-format
-msgid "VMware"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Format"
-msgstr "格式"
-
-#. Tag: para
-#, no-c-format
-msgid "OVA"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "OS Type"
-msgstr "操作系统类型"
-
-#. Tag: para
-#, no-c-format
-msgid "Debian GNU/Linux 5.0 (32-bit)"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Extractable"
-msgstr "可提取"
-
-#. Tag: para
-#, no-c-format
-msgid "no"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Password Enabled"
-msgstr "已启用密码"
-
-#. Tag: para
-#, no-c-format
-msgid "Public"
-msgstr "公用"
-
-#. Tag: para
-#, no-c-format
-msgid "Featured"
-msgstr "精选"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Watch the screen to be sure that the template downloads successfully and "
-"enters the READY state. Do not proceed until this is successful."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Stop all Usage Servers if running. Run this on all Usage Server hosts."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# service cloud-usage stop"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Stop the Management Servers. Run this on all Management Server hosts."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# service cloud-management stop"
-msgstr "# service cloud-management stop"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"On the MySQL master, take a backup of the MySQL databases. We recommend "
-"performing this step even in test upgrades. If there is an issue, this will "
-"assist with debugging."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In the following commands, it is assumed that you have set the root password"
-" on the database, which is a CloudStack recommended best practice. "
-"Substitute your own MySQL root password."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>mysqldump</command> -u root -p<replaceable>mysql_password</replaceable> cloud &gt; <filename>cloud-backup.dmp</filename>\n"
-"<prompt>#</prompt> <command>mysqldump</command> -u root -p<replaceable>mysql_password</replaceable> cloud_usage &gt; <filename>cloud-usage-backup.dmp</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Either build RPM/DEB packages as detailed in the Installation Guide, or use "
-"one of the community provided yum/apt repositories to gain access to the "
-"&PRODUCT; binaries."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"After you have configured an appropriate yum or apt repository, you may "
-"execute the one of the following commands as appropriate for your "
-"environment in order to upgrade &PRODUCT;:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "<prompt>#</prompt> <command>yum</command> update cloud-*"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>apt-get</command> update\n"
-"<prompt>#</prompt> <command>apt-get</command> upgrade cloud-*"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"You will, of course, have to agree to the changes suggested by Yum or APT."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If the upgrade output includes a message similar to the following, then some"
-" custom content was found in your old components.xml, and you need to merge "
-"the two files:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"warning: /etc/cloud/management/components.xml created as "
-"/etc/cloud/management/components.xml.rpmnew "
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Instructions follow in the next step."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you have made changes to your copy of "
-"<filename>/etc/cloud/management/components.xml</filename> the changes will "
-"be preserved in the upgrade. However, you need to do the following steps to "
-"place these changes in a new version of the file which is compatible with "
-"version 4.0.0-incubating."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Make a backup copy of "
-"<filename>/etc/cloud/management/components.xml</filename>. For example:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"# mv /etc/cloud/management/components.xml /etc/cloud/management/components"
-".xml-backup"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Copy <filename>/etc/cloud/management/components.xml.rpmnew</filename> to "
-"create a new <filename>/etc/cloud/management/components.xml</filename>:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"# cp -ap /etc/cloud/management/components.xml.rpmnew "
-"/etc/cloud/management/components.xml"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Merge your changes from the backup file into the new "
-"<filename>components.xml</filename>."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# vi /etc/cloud/management/components.xml"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you have more than one management server node, repeat the upgrade steps "
-"on each node."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Start the first Management Server. Do not start any other Management Server "
-"nodes yet."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# service cloud-management start"
-msgstr "#service cloud-management start"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Wait until the databases are upgraded. Ensure that the database upgrade is "
-"complete. After confirmation, start the other Management Servers one at a "
-"time by running the same command on each node."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Failing to restart the Management Server indicates a problem in the upgrade."
-" Having the Management Server restarted without any issues indicates that "
-"the upgrade is successfully completed."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Start all Usage Servers (if they were running on your previous version). "
-"Perform this on each Usage Server host."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># service cloud-usage start</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Additional steps are required for each KVM host. These steps will not affect"
-" running guests in the cloud. These steps are required only for clouds using"
-" KVM as hosts and only on the KVM hosts."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Configure a yum or apt respository containing the &PRODUCT; packages as "
-"outlined in the Installation Guide."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Stop the running agent."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># service cloud-agent stop</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Update the agent software with one of the following command sets as "
-"appropriate for your environment."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># yum update cloud-*</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># apt-get update</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># apt-get upgrade cloud-*</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Start the agent."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# service cloud-agent start"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Edit <filename>/etc/cloud/agent/agent.properties</filename> to change the "
-"resource parameter from "
-"\"com.cloud.agent.resource.computing.LibvirtComputingResource\" to "
-"\"com.cloud.hypervisor.kvm.resource.LibvirtComputingResource\"."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Start the cloud agent and cloud management services."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"When the Management Server is up and running, log in to the CloudStack UI "
-"and restart the virtual router for proper functioning of all the features."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Log in to the CloudStack UI as administrator, and check the status of the "
-"hosts. All hosts should come to Up state (except those that you know to be "
-"offline). You may need to wait 20 or 30 minutes, depending on the number of "
-"hosts."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Troubleshooting: If login fails, clear your browser cache and reload the "
-"page."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Do not proceed to the next step until the hosts show in Up state."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "If you are upgrading from 3.0.2, perform the following:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Ensure that the admin port is set to 8096 by using the "
-"\"integration.api.port\" global parameter."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"This port is used by the cloud-sysvmadm script at the end of the upgrade "
-"procedure. For information about how to set this parameter, see \"Setting "
-"Global Configuration Parameters\" in the Installation Guide."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Restart the Management Server."
-msgstr "重启管理服务器."
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you don't want the admin port to remain open, you can set it to null "
-"after the upgrade is done and restart the management server."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Run the <command>cloud-sysvmadm</command> script to stop, then start, all "
-"Secondary Storage VMs, Console Proxy VMs, and virtual routers. Run the "
-"script once on each management server. Substitute your own IP address of the"
-" MySQL instance, the MySQL user to connect as, and the password to use for "
-"that user. In addition to those parameters, provide the "
-"<command>-c</command> and <command>-r</command> arguments. For example:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<command># nohup cloud-sysvmadm -d 192.168.1.5 -u cloud -p password -c -r "
-"&gt; sysvm.log 2&gt;&amp;1 &amp;</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># tail -f sysvm.log</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"This might take up to an hour or more to run, depending on the number of "
-"accounts in the system."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If needed, upgrade all Citrix XenServer hypervisor hosts in your cloud to a "
-"version supported by CloudStack 4.0.0-incubating. The supported versions are"
-" XenServer 5.6 SP2 and 6.0.2. Instructions for upgrade can be found in the "
-"CloudStack 4.0.0-incubating Installation Guide."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Now apply the XenServer hotfix XS602E003 (and any other needed hotfixes) to "
-"XenServer v6.0.2 hypervisor hosts."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Disconnect the XenServer cluster from CloudStack."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In the left navigation bar of the CloudStack UI, select Infrastructure. "
-"Under Clusters, click View All. Select the XenServer cluster and click "
-"Actions - Unmanage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"This may fail if there are hosts not in one of the states Up, Down, "
-"Disconnected, or Alert. You may need to fix that before unmanaging this "
-"cluster."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Wait until the status of the cluster has reached Unmanaged. Use the "
-"CloudStack UI to check on the status. When the cluster is in the unmanaged "
-"state, there is no connection to the hosts in the cluster."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "To clean up the VLAN, log in to one XenServer host and run:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command>/opt/xensource/bin/cloud-clean-vlan.sh</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Now prepare the upgrade by running the following on one XenServer host:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command>/opt/xensource/bin/cloud-prepare-upgrade.sh</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you see a message like \"can't eject CD\", log in to the VM and unmount "
-"the CD, then run this script again."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Upload the hotfix to the XenServer hosts. Always start with the Xen pool "
-"master, then the slaves. Using your favorite file copy utility (e.g. "
-"WinSCP), copy the hotfixes to the host. Place them in a temporary folder "
-"such as /tmp."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "On the Xen pool master, upload the hotfix with this command:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command>xe patch-upload file-name=XS602E003.xsupdate</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Make a note of the output from this command, which is a UUID for the hotfix "
-"file. You'll need it in another step later."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"(Optional) If you are applying other hotfixes as well, you can repeat the "
-"commands in this section with the appropriate hotfix number. For example, "
-"XS602E004.xsupdate."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Manually live migrate all VMs on this host to another host. First, get a "
-"list of the VMs on this host:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># xe vm-list</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Then use this command to migrate each VM. Replace the example host name and "
-"VM name with your own:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<command># xe vm-migrate live=true host=<replaceable>host-name</replaceable>"
-" vm=<replaceable>VM-name</replaceable></command>"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Troubleshooting"
-msgstr "故障排查"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you see a message like \"You attempted an operation on a VM which "
-"requires PV drivers to be installed but the drivers were not detected,\" "
-"run:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<command>/opt/xensource/bin/make_migratable.sh b6cf79c8-02ee-050b-922f-"
-"49583d9f1a14</command>."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Apply the hotfix. First, get the UUID of this host:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# xe host-list"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Then use the following command to apply the hotfix. Replace the example host"
-" UUID with the current host ID, and replace the hotfix UUID with the output "
-"from the patch-upload command you ran on this machine earlier. You can also "
-"get the hotfix UUID by running xe patch-list."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<command>xe</command> patch-apply host-uuid=<replaceable>host-"
-"uuid</replaceable> uuid=<replaceable>hotfix-uuid</replaceable>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Copy the following files from the CloudStack Management Server to the host."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Copy from here..."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "...to here"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "/opt/xensource/sm/NFSSR.py"
-msgstr "/opt/xensource/sm/NFSSR.py"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/setupxenserver.sh"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "/opt/xensource/bin/setupxenserver.sh"
-msgstr "/opt/xensource/bin/setupxenserver.sh"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/make_migratable.sh"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "/opt/xensource/bin/make_migratable.sh"
-msgstr "/opt/xensource/bin/make_migratable.sh"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"(Only for hotfixes XS602E005 and XS602E007) You need to apply a new Cloud "
-"Support Pack."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Download the CSP software onto the XenServer host from one of the following "
-"links:"
-msgstr "从下列链接地址下载CSP软件到XenServer主机链接地址:"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"For hotfix XS602E005: <ulink "
-"url=\"http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E005/56710"
-"/xe-phase-2/xenserver-cloud-"
-"supp.tgz\">http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E005/56710"
-"/xe-phase-2/xenserver-cloud-supp.tgz</ulink>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"For hotfix XS602E007: <ulink "
-"url=\"http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E007/57824"
-"/xe-phase-2/xenserver-cloud-"
-"supp.tgz\">http://coltrane.eng.hq.xensource.com/release/XenServer-6.x/XS-6.0.2/hotfixes/XS602E007/57824"
-"/xe-phase-2/xenserver-cloud-supp.tgz</ulink>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Extract the file:"
-msgstr "解压文件:"
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# tar xf xenserver-cloud-supp.tgz"
-msgstr "# tar xf xenserver-cloud-supp.tgz"
-
-#. Tag: para
-#, no-c-format
-msgid "Run the following script:"
-msgstr "执行下列脚本:"
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# xe-install-supplemental-pack xenserver-cloud-supp.iso"
-msgstr "# xe-install-supplemental-pack xenserver-cloud-supp.iso"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If the XenServer host is part of a zone that uses basic networking, disable "
-"Open vSwitch (OVS):"
-msgstr "如果XenServer主机所在的zone使用的是基本网络模式 ,禁用 Open vSwitch (OVS):"
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# xe-switch-network-backend  bridge"
-msgstr "# xe-switch-network-backend  bridge"
-
-#. Tag: para
-#, no-c-format
-msgid "Reboot this XenServer host."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Run the following:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If the message \"mv: cannot stat `/etc/cron.daily/logrotate': No such file "
-"or directory\" appears, you can safely ignore it."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"for pbd in `xe pbd-list currently-attached=false| grep ^uuid | awk '{print "
-"$NF}'`; do xe pbd-plug uuid=$pbd ; "
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"On each slave host in the Xen pool, repeat these steps, starting from "
-"\"manually live migrate VMs.\""
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Troubleshooting Tip"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If passwords which you know to be valid appear not to work after upgrade, or"
-" other UI issues are seen, try clearing your browser cache and reloading the"
-" UI page."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Upgrade from 2.2.14 to 4.0.0-incubating"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Ensure that you query your IPaddress usage records and process them; for "
-"example, issue invoices for any usage that you have not yet billed users "
-"for."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Starting in 3.0.2, the usage record format for IP addresses is the same as "
-"the rest of the usage types. Instead of a single record with the assignment "
-"and release dates, separate records are generated per aggregation period "
-"with start and end dates. After upgrading to 4.0.0-incubating, any existing "
-"IP address usage records in the old format will no longer be available."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you are using version 2.2.0 - 2.2.13, first upgrade to 2.2.14 by using "
-"the instructions in the 2.2.14 Release Notes."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "KVM Hosts"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If KVM hypervisor is used in your cloud, be sure you completed the step to "
-"insert a valid username and password into the host_details table on each KVM"
-" node as described in the 2.2.14 Release Notes. This step is critical, as "
-"the database will be encrypted after the upgrade to 4.0.0-incubating."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"While running the 2.2.14 system, log in to the UI as root administrator."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Using the UI, add a new System VM template for each hypervisor type that is "
-"used in your cloud. In each zone, add a system VM template for each "
-"hypervisor used in that zone"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In the Register template dialog box, specify the following values depending "
-"on the hypervisor type (do not change these):"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "XenServer"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Name: systemvm-xenserver-3.0.0"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Description: systemvm-xenserver-3.0.0"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"URL: http://download.cloud.com/templates/acton/acton-"
-"systemvm-02062012.vhd.bz2"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Zone: Choose the zone where this hypervisor is used"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Hypervisor: XenServer"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Format: VHD"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "OS Type: Debian GNU/Linux 5.0 (32-bit)"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Extractable: no"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Password Enabled: no"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Public: no"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Featured: no"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "KVM"
-msgstr "KVM"
-
-#. Tag: para
-#, no-c-format
-msgid "Name: systemvm-kvm-3.0.0"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Description: systemvm-kvm-3.0.0"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"URL: http://download.cloud.com/templates/acton/acton-"
-"systemvm-02062012.qcow2.bz2"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Hypervisor: KVM"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Format: QCOW2"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Name: systemvm-vmware-3.0.0"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Description: systemvm-vmware-3.0.0"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"URL: http://download.cloud.com/templates/burbank/burbank-"
-"systemvm-08012012.ova"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Hypervisor: VMware"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Format: OVA"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Watch the screen to be sure that the template downloads successfully and "
-"enters the READY state. Do not proceed until this is successful"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<emphasis role=\"bold\">WARNING</emphasis>: If you use more than one type of"
-" hypervisor in your cloud, be sure you have repeated these steps to download"
-" the system VM template for each hypervisor type. Otherwise, the upgrade "
-"will fail."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>mysqldump</command> -u root -p<replaceable>mysql_password</replaceable> cloud &gt; <filename>cloud-backup.dmp</filename>\n"
-"<prompt>#</prompt> <command>mysqldump</command> -u root -p<replaceable>mysql_password</replaceable> cloud_usage &gt; <filename>cloud-usage-backup.dmp</filename>\n"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you have made changes to your existing copy of the file components.xml in"
-" your previous-version CloudStack installation, the changes will be "
-"preserved in the upgrade. However, you need to do the following steps to "
-"place these changes in a new version of the file which is compatible with "
-"version 4.0.0-incubating."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"How will you know whether you need to do this? If the upgrade output in the "
-"previous step included a message like the following, then some custom "
-"content was found in your old components.xml, and you need to merge the two "
-"files:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Make a backup copy of your "
-"<filename>/etc/cloud/management/components.xml</filename> file. For example:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>mv</command> "
-"<filename>/etc/cloud/management/components.xml</filename> "
-"<filename>/etc/cloud/management/components.xml-backup</filename>"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>cp</command> -ap "
-"<filename>/etc/cloud/management/components.xml.rpmnew</filename> "
-"<filename>/etc/cloud/management/components.xml</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Merge your changes from the backup file into the new components.xml file."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>vi</command> <filename>/etc/cloud/management/components.xml</filename>\n"
-"              "
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you have made changes to your existing copy of the "
-"<filename>/etc/cloud/management/db.properties</filename> file in your "
-"previous-version CloudStack installation, the changes will be preserved in "
-"the upgrade. However, you need to do the following steps to place these "
-"changes in a new version of the file which is compatible with version "
-"4.0.0-incubating."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Make a backup copy of your file "
-"<filename>/etc/cloud/management/db.properties</filename>. For example:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>mv</command> "
-"<filename>/etc/cloud/management/db.properties</filename> "
-"<filename>/etc/cloud/management/db.properties-backup</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Copy <filename>/etc/cloud/management/db.properties.rpmnew</filename> to "
-"create a new <filename>/etc/cloud/management/db.properties</filename>:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>cp</command> -ap "
-"<filename>/etc/cloud/management/db.properties.rpmnew</filename> "
-"<filename>etc/cloud/management/db.properties</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Merge your changes from the backup file into the new db.properties file."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>vi</command> "
-"<filename>/etc/cloud/management/db.properties</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"On the management server node, run the following command. It is recommended "
-"that you use the command-line flags to provide your own encryption keys. See"
-" Password and Key Encryption in the Installation Guide."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>cloud-setup-encryption</command> -e "
-"<replaceable>encryption_type</replaceable> -m "
-"<replaceable>management_server_key</replaceable> -k "
-"<replaceable>database_key</replaceable>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"When used without arguments, as in the following example, the default "
-"encryption type and keys will be used:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"(Optional) For encryption_type, use file or web to indicate the technique "
-"used to pass in the database encryption password. Default: file."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"(Optional) For management_server_key, substitute the default key that is "
-"used to encrypt confidential parameters in the properties file. Default: "
-"password. It is highly recommended that you replace this with a more secure "
-"value"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"(Optional) For database_key, substitute the default key that is used to "
-"encrypt confidential parameters in the CloudStack database. Default: "
-"password. It is highly recommended that you replace this with a more secure "
-"value."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Repeat steps 10 - 14 on every management server node. If you provided your "
-"own encryption key in step 14, use the same key on all other management "
-"servers."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Wait until the databases are upgraded. Ensure that the database upgrade is "
-"complete. You should see a message like \"Complete! Done.\" After "
-"confirmation, start the other Management Servers one at a time by running "
-"the same command on each node."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# service cloud-usage start"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"(KVM only) Additional steps are required for each KVM host. These steps will"
-" not affect running guests in the cloud. These steps are required only for "
-"clouds using KVM as hosts and only on the KVM hosts."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Configure your CloudStack package repositories as outlined in the "
-"Installation Guide"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# service cloud-agent stop"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Update the agent software with one of the following command sets as "
-"appropriate."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"\n"
-"                 <prompt>#</prompt> <command>apt-get</command> update\n"
-"<prompt>#</prompt> <command>apt-get</command> upgrade cloud-*\n"
-"              "
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Copy the contents of the <filename>agent.properties</filename> file to the "
-"new <filename>agent.properties</filename> file by using the following "
-"command"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<command>sed</command> -i "
-"'s/com.cloud.agent.resource.computing.LibvirtComputingResource/com.cloud.hypervisor.kvm.resource.LibvirtComputingResource/g'"
-" <filename>/etc/cloud/agent/agent.properties</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Log in to the CloudStack UI as admin, and check the status of the hosts. All"
-" hosts should come to Up state (except those that you know to be offline). "
-"You may need to wait 20 or 30 minutes, depending on the number of hosts."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Do not proceed to the next step until the hosts show in the Up state. If the"
-" hosts do not come to the Up state, contact support."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Run the following script to stop, then start, all Secondary Storage VMs, "
-"Console Proxy VMs, and virtual routers."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Run the command once on one management server. Substitute your own IP "
-"address of the MySQL instance, the MySQL user to connect as, and the "
-"password to use for that user. In addition to those parameters, provide the "
-"\"-c\" and \"-r\" arguments. For example:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>nohup cloud-sysvmadm</command> -d <replaceable>192.168.1.5</replaceable> -u cloud -p <replaceable>password</replaceable> -c -r &gt; sysvm.log 2&gt;&amp;1 &amp;\n"
-"<prompt>#</prompt> <command>tail</command> -f <filename>sysvm.log</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"After the script terminates, check the log to verify correct execution:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>tail</command> -f <filename>sysvm.log</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The content should be like the following:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"\n"
-"Stopping and starting 1 secondary storage vm(s)...\n"
-"Done stopping and starting secondary storage vm(s)\n"
-"Stopping and starting 1 console proxy vm(s)...\n"
-"Done stopping and starting console proxy vm(s).\n"
-"Stopping and starting 4 running routing vm(s)...\n"
-"Done restarting router(s).\n"
-"\t\t\t\t\t\t"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you would like additional confirmation that the new system VM templates "
-"were correctly applied when these system VMs were rebooted, SSH into the "
-"System VM and check the version."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Use one of the following techniques, depending on the hypervisor."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "XenServer or KVM:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"SSH in by using the link local IP address of the system VM. For example, in "
-"the command below, substitute your own path to the private key used to log "
-"in to the system VM and your own link local IP."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Run the following commands on the XenServer or KVM host on which the system "
-"VM is present:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>ssh</command> -i <replaceable>private-key-path</replaceable> <replaceable>link-local-ip</replaceable> -p 3922\n"
-"# cat /etc/cloudstack-release"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The output should be like the following:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "ESXi"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"SSH in using the private IP address of the system VM. For example, in the "
-"command below, substitute your own path to the private key used to log in to"
-" the system VM and your own private IP."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Run the following commands on the Management Server:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>ssh</command> -i <replaceable>private-key-path</replaceable> <replaceable>private-ip</replaceable> -p 3922\n"
-"<prompt>#</prompt> <command>cat</command> <filename>/etc/cloudstack-release</filename>\n"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Apply the XenServer hotfix XS602E003 (and any other needed hotfixes) to "
-"XenServer v6.0.2 hypervisor hosts."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "/opt/xensource/bin/cloud-clean-vlan.sh"
-msgstr "/opt/xensource/bin/cloud-clean-vlan.sh"
-
-#. Tag: para
-#, no-c-format
-msgid "Prepare the upgrade by running the following on one XenServer host:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "/opt/xensource/bin/cloud-prepare-upgrade.sh"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If you see a message like \"can't eject CD\", log in to the VM and umount "
-"the CD, then run this script again."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Upload the hotfix to the XenServer hosts. Always start with the Xen pool "
-"master, then the slaves. Using your favorite file copy utility (e.g. "
-"WinSCP), copy the hotfixes to the host. Place them in a temporary folder "
-"such as /root or /tmp."
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "xe patch-upload file-name=XS602E003.xsupdate"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid "# xe vm-list"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"<prompt>#</prompt> <command>xe</command> vm-migrate live=true "
-"host=<replaceable>host-name</replaceable> vm=<replaceable>VM-"
-"name</replaceable>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># xe host-list</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<command>xe patch-apply host-uuid=<replaceable>host-uuid</replaceable> "
-"uuid=<replaceable>hotfix-uuid</replaceable></command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<filename>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<filename>/opt/xensource/sm/NFSSR.py</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<filename>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<filename>/opt/xensource/bin/setupxenserver.sh</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<filename>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/make_migratable.sh</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<filename>/opt/xensource/bin/make_migratable.sh</filename>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># tar xf xenserver-cloud-supp.tgz</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<command># xe-install-supplemental-pack xenserver-cloud-supp.iso</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command># xe-switch-network-backend bridge</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "<command>/opt/xensource/bin/setupxenserver.sh</command>"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"<command>for pbd in `xe pbd-list currently-attached=false| grep ^uuid | awk "
-"'{print $NF}'`; do xe pbd-plug uuid=$pbd ; </command>"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Version 4.0.0-incubating"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "What’s New in 4.0.0-incubating"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Apache CloudStack 4.0.0-incubating includes the following new features:"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Inter-VLAN Routing"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Inter-VLAN Routing is the capability to route network traffic between VLANs."
-" This feature enables you to set up Virtual Private Clouds (VPC) that can "
-"hold multi-tier applications. These tiers are deployed on different VLANs "
-"that can communicate with each other. You can provision VLANs to the tiers "
-"your create, and VMs can be deployed on different tiers, such as Web, "
-"Application, or Database. The VLANs are connected to a virtual router, which"
-" facilitates communication between the VMs. In effect, you can segment VMs "
-"by means of VLANs into different networks that can host multi-tier "
-"applications. Such segmentation by means of VLANs logically separate "
-"application VMs for higher security and lower broadcasts, while remaining "
-"physically connected to the same device."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "This feature is supported on XenServer and VMware hypervisors."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Site-to-Site VPN"
-msgstr "点对点VPN"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"A Site-to-Site VPN connection helps you establish a secure connection from "
-"an enterprise datacenter to the cloud infrastructure. This allows users to "
-"access the guest VMs by establishing a VPN connection to the virtual router "
-"of the account from a device in the datacenter of the enterprise. Having "
-"this facility eliminates the need to establish VPN connections to individual"
-" VMs."
-msgstr "一个站点到站点的VPN连接可以帮助你建立从云基础架构到企业内部数据中心的安全连接.这就允许一个账户从企业内部数据中心的设备连接到此账户启用VPN连接的虚拟路由器上, 从而通过VPN连接到该账户的虚拟机."
-
-#. Tag: para
-#, no-c-format
-msgid "The supported endpoints on the remote datacenters are:"
-msgstr "目前支持的数据中心的终端设备是:"
-
-#. Tag: para
-#, no-c-format
-msgid "Cisco ISR with IOS 12.4 or later"
-msgstr "Cisco ISR IOS 12.4或更新"
-
-#. Tag: para
-#, no-c-format
-msgid "Juniper J-Series routers with JunOS 9.5 or later"
-msgstr "Juniper J-系统 路由器  JunOS 9.5 或更新版本"
-
-#. Tag: title
-#, no-c-format
-msgid "Local Storage Support for Data Volumes"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"You can now create data volumes on local storage. The data volume is placed "
-"on the same XenServer host as the VM instance that is attached to the data "
-"volume. These local data volumes can be attached to virtual machines, "
-"detached, re-attached, and deleted just as with the other types of data "
-"volume. In earlier releases of CloudStack, only the root disk could be "
-"placed in local storage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Local storage is ideal for scenarios where persistence of data volumes and "
-"HA is not required. Some of the benefits include reduced disk I/O latency "
-"and cost reduction from using inexpensive local disks."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In order for local volumes to be used, the feature must be enabled for the "
-"zone."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"You can create a data disk offering for local storage. When a user creates a"
-" new VM, they can select this disk offering in order to cause the data disk "
-"volume to be placed in local storage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"You can not migrate a VM that has a volume in local storage to a different "
-"host, nor migrate the volume itself away to a different host. If you want to"
-" put a host into maintenance mode, you must first stop any VMs with local "
-"data volumes on that host."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Local storage support for volumes is available for XenServer, KVM, and "
-"VMware hypervisors."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Tags"
-msgstr "标签"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"A tag is a key-value pair that stores metadata about a resource in the "
-"cloud. Tags are useful for categorizing resources. For example, you can tag "
-"a user VM with a value that indicates the user's city of residence. In this "
-"case, the key would be \"city\" and the value might be \"Toronto\" or "
-"\"Tokyo.\" You can then request CloudStack to find all resources that have a"
-" given tag; for example, VMs for users in a given city."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"You can tag a user virtual machine, volume, snapshot, guest network, "
-"template, ISO, firewall rule, port forwarding rule, public IP address, "
-"security group, load balancer rule, project, VPC, network ACL, or static "
-"route. You can not tag a remote access VPN."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"You can work with tags through the UI or through the new API commands "
-"createTags, deleteTags, and listTags. You can define multiple tags for each "
-"resource. There is no limit on the number of tags you can define. Each tag "
-"can be up to 255 characters long. Users can define tags on the resources "
-"they own, and administrators can define tags on any resources in the cloud."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"A new optional input parameter, \"tags,\" has been added to many of the "
-"list* API commands. The following example shows how to use this new "
-"parameter to find all the volumes having tag region=canada OR tag "
-"city=Toronto:"
-msgstr ""
-
-#. Tag: programlisting
-#, no-c-format
-msgid ""
-"command=listVolumes\n"
-"&amp;listAll=true\n"
-"&amp;tags[0].key=region\n"
-"&amp;tags[0].value=canada\n"
-"&amp;tags[1].key=city\n"
-"&amp;tags[1].value=Toronto"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The following API commands have the new \"tags\" input parameter:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listVirtualMachines"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listVolumes"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listSnapshots"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listNetworks"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listTemplates"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listIsos"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listFirewallRules"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listPortForwardingRules"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listPublicIpAddresses"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listSecurityGroups"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listLoadBalancerRules"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listProjects"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listVPCs"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listNetworkACLs"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "listStaticRoutes"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "AWS API Changes for Tags"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Some changes have been made to the Amazon Web Services API compatibility "
-"support in order to accommodate the new tagging feature."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "New APIs:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "New API"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "ec2-create-tags"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Add tags to one or more resources."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "ec2-delete-tags"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Remove tags from one or more resources."
-msgstr ""
-
-#. Tag: entry
-#, no-c-format
-msgid "ec2-describe-tags"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Show currently defined tags."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Changed APIs:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Changed API"
-msgstr ""
-
-#. Tag: entry
-#, no-c-format
-msgid "ec2-describe-images"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Output now shows tags defined for each image."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "ec2-describe-instances"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The following filters can now be passed in to limit the output result set: "
-"tag-key, tag-value and tag:key"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "ec2-describe-snapshots"
-msgstr ""
-
-#. Tag: entry
-#, no-c-format
-msgid "ec2-describe-volumes"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Secure Console Access on XenServer"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"With the addition of Secure Console feature, users can now securely access "
-"the VM consoles on the XenServer hypervisor. You can either SSH or use the "
-"View Console option in the Management Server to securely connect to the VMs "
-"on the XenServer host. The Management Server uses the xapi API to stream the"
-" VM consoles. However, there is no change in the way you can access the "
-"console of a VM. This feature is supported on XenServer 5.6 and 6.0 "
-"versions."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Stopped VM"
-msgstr "停止虚拟机"
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"This release supports creating VMs without starting them on the backend. You"
-" can determine whether the VM needs to be started as part of the VM "
-"deployment. A VM can be deployed in two ways: create and start a VM (the "
-"default method); create a VM and leave it in the stopped state."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"A new request parameter, startVM, is introduced in the deployVm API to "
-"support the stopped VM feature. The possible values are:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "true - The VM starts as a part of the VM deployment"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"false - The VM is left in stopped state at the end of the VM deployment"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Uploading an Existing Volume to a Virtual Machine"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Existing data can now be made accessible to a virtual machine. This is "
-"called uploading a volume to the VM. For example, this is useful to upload "
-"data from a local file system and attach it to a VM. Root administrators, "
-"domain administrators, and end users can all upload existing volumes to VMs."
-" The upload is performed by using HTTP. The uploaded volume is placed in the"
-" zone's secondary storage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "This functionality is supported for the following hypervisors:"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Hypervisor : Disk Image Format"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "XenServer : VHD"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "VMware : OVA"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "KVM : QCOW2"
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Dedicated High-Availability Hosts"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"One or more hosts can now be designated for use only by high-availability "
-"(HA) enabled VMs that are restarted due to a host failure. Setting up a pool"
-" of such dedicated HA hosts as the recovery destination for all HA-enabled "
-"VMs make it easier to determine which VMs are restarted as part of the high-"
-"availability function. You can designate a host as a dedicated-HA restart "
-"node only if the Dedicated HA Hosts feature is enabled by setting the "
-"appropriate global configuration parameter."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Support for Amazon Web Services API"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"This release supports Amazon Web Services APIs, including Elastic Compute "
-"Cloud (EC2) API. Fidelity with the EC2 API and the installation experience "
-"for this functionality are both enhanced. In prior releases, users were "
-"required to install a separate component called CloudBridge, in addition to "
-"installing the Management Server. For new installations of CloudStack "
-"4.0.0-incubating, this software is installed automatically along with "
-"CloudStack and runs in a more closely integrated fashion. The feature is "
-"disabled by default, but can be easily enabled by setting the appropriate "
-"global configuration parameter and performing a few setup steps."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "The Nicira NVP Plugin"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The Nicira NVP plug-in allows CloudStack to use the Nicira solution for "
-"virtualized network as a provider for CloudStack networks and services. In "
-"CloudStack 4.0.0-incubating this plug-in supports the Connectivity service. "
-"This service is responsible for creating Layer 2 networks supporting the "
-"networks created by guests. When a tenant creates a new network, instead of "
-"a traditional VLAN, a logical network will be created by sending the "
-"appropriate calls to the Nicira NVP Controller. The plug-in has been tested "
-"with Nicira NVP versions 2.1.0, 2.2.0 and 2.2.1."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "The BigSwitch Controller Plugin"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The BigSwitch Controller plug-in adds OpenFlow based solution for network "
-"virtualization to CloudStack. The plugin supports both BigSwitch commercial "
-"controller and the opensource Floodlight controller. The plugin functions as"
-" a provider for CloudStack networks and Connectivity service. This service "
-"is responsible for creating Layer 2 networks supporting the networks created"
-" by guests. When a tenant creates a new network, a virutal network segment "
-"will be created by sending the appropriate calls to the BigSwitch "
-"Controller."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Support for CAStor Cluster"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"CloudStack 4.0.0-incubating supports using a CAStor cluster as the back-end "
-"storage system for a CloudStack S3 front-end. The CAStor back-end storage "
-"for CloudStack extends the existing storage classes and allows the storage "
-"configuration attribute to point to a CAStor cluster. This feature makes use"
-" of the CloudStack server's local disk to spool files before writing them to"
-" CAStor when handling the PUT operations. However, a file must be "
-"successfully written into the CAStor cluster prior to the return of a "
-"success code to the S3 client to ensure that the transaction outcome is "
-"correctly reported."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The S3 multipart file upload is not supported in this release. You are "
-"prompted with proper error message if a multipart upload is attempted."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Clustered Logical Volume Manager Support for KVM"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"This release adds Clustered Logical Volume Manager (CLVM) storage support "
-"for KVM hosts. With this support, you can use CLVM as primary storage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The CLVM support for KVM allows root and data disks (primary storage) to "
-"reside on Linux logical volumes. The administrators are required to "
-"configure CLVM on the KVM hosts independent of CloudStack. When the volume "
-"groups are available, an administrator can simply add primary storage of "
-"type CLVM, providing the volume group name. Then CloudStack creates and "
-"manages logical volumes as needed."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"CLVM also supports Snapshots. CloudStack creates an LVM snapshot, copy the "
-"applicable logical volume to the secondary storage in the qcow2 format, and "
-"then delete the LVM snapshot."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Rados Block Device Support for KVM"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"You can now use Rados Block Device (RBD) to run instances on Apache "
-"CloudStack 4.0.0-incubating. This can be done by adding a RBD pool as "
-"primary storage. Before using RBD, ensure that Qemu is compiled with RBD "
-"enabled, and the libvirt version is at least 0.10 with RBD enabled on the "
-"KVM host"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Create a disk offering for RBD so that you can ensure that "
-"StoragePoolAllocator chooses the RBD pool to deploy instances."
-msgstr ""
-
-#. Tag: title
-#, no-c-format
-msgid "Issues Fixed in 4.0.0-incubating"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Many bugs include a defect number that reflects the bug number that was held"
-" in the bug tracker run by Citrix (bugs.cloudstack.org). The Apache "
-"CloudStack project now uses <ulink "
-"url=\"https://issues.apache.org/jira/browse/CLOUDSTACK\">Jira</ulink> to "
-"manage its bugs, so some of the bugs that are referenced here may not be "
-"available to view. However, we are still including them for completeness."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Defect"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Many"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"vSphere 5.0 now has GA support. Formerly only Beta support was provided."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-16135"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Creating volumes after upgrading from snapshot taken in 2.2.14 no longer "
-"deletes the snapshot physically from the secondary storage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-16122"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In a site-to-site VPN setup, alerts are generated when the VPC virtual "
-"router is rebooted with multiple vpn connections."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-16022"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If host connection fails due to a database error, host now disconnects and "
-"the Managerment Server id is removed."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-16011"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Name of network offering is no longer truncated due to too-narrow field "
-"width in Add Guest Network dialog box."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15978"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"When the virtual router and its host go down, the high availability "
-"mechanism now works for the virtual router."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15921"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The 2.2.x security group script now accounts for the VMs created in the "
-"version 2.1 timeframe."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15919"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"A level parameter is added to the listVolumes command; therefore queries "
-"return the response more quickly."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15904"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Upgrade from version 2.2.14 to CloudStack-3.0.5-0.2944-rhel5 works as "
-"expected. The upgrade script, /usr/share/cloud/setup/db/schema-"
-"2214to30-cleanup.sql, works as expected."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15879"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The database upgrade from version 3.0.4 to 3.0.5 works as expected."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15807"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Network label for OVM now available in UI."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15779"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"When the thumbnail is requested, the console session will not be terminated."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15778"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Fetching a VM thumbnail now gets a thumbnail of appropriate visual "
-"dimensions."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15734"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "KVM Snapshots no longer shows incorrect disk usage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15733"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The domainId parameter for the listNetworks command now lists the resources "
-"belonging to the domain specified."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15676"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Stopping the router no longer fails with the null pointer exception."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15648"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"If creating a volume from a snapshot fails, the error is reported on the UI "
-"but the volume is stuck in the creating state."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15646"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "createFirewallRule API no longer causes null pointer exception."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15628"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In a KVM host, the high availability mechanism no longer takes a long time "
-"to migrate VMs to another KVM host if there are multiple storage pools."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15627"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Metadata instance-id and vm-id for existing VMs stays the same after "
-"upgrade."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15621"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Solved difficulty with allocating disk volumes when running multiple VM "
-"deployment in parallel."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15603"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CloudStack now stop the VMs when destroyVM command is called."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15586"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Public Vlan for an account no longer fails if multiple physical networks are"
-" present."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15582"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The dns-name filter is now supported for ec2-describe-instances in the "
-"Amazon Web Services API compatibility commands. The filter maps to the name "
-"of a user VM."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15503"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"An IP address which has static NAT rules can now be released. Subsequently, "
-"restarting this network after it was shutdown can succeed."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15464"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Can now delete static route whose state is set to Revoke."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15443"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Creating a firewall rule no longer fails with an internal server error."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15398"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Corrected technique for programming DNS on the user VMs."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15356"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Internal DNS 2 entry now correctly shown in UI."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15335"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The CloudBridge S3 Engine now connects to the database by using the "
-"deciphered password in the db.properties file."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15318"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"UI now correctly prevents the user from stopping a VM that is in the "
-"Starting state."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15307"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Fixed Japanese localization of instance statuses in the Instances menu."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15278"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The deployment planner no longer takes long time to locate a suitable host "
-"to deploy VMs when large number of clusters are present."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15274"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Creating a VLAN range using Zone ID without network ID now succeeds."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15243"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Now check to be sure source NAT and VPN have same provider."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15232"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Ensure that networks using external load balancer/firewall in 2.2.14 or "
-"earlier can properly upgrade."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15200"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"No exception when trying to attach the same volume while attaching the first"
-" volume is in progress."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15173"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Additional cluster can no longer be added with same VSM IP address as "
-"another cluster."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15167"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"AWS API calls now honor the admin account's ability to view or act on the "
-"resources owned by the regular users."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15163"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The minimum limit is not honored when there is not enough capacity to deploy"
-" all the VMs and the ec2-run-instances command with the -n &gt;n1 -n2&gt; "
-"option is used to deploy multiple VMs."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15157"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Can now add/enable service providers for multiple physical networks through "
-"the UI."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15145"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"AWS API call ec2-register has better error handling for negative cases."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15122"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Filters now supported for AWS API call ec2-describe-availability-zones."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15120"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Actions column in UI of Volume page now shows action links."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15099"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Buttons no longer overlap text on Account Deletion confirmation page in UI."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15095"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Ensures you can not create a VM with a CPU frequency greater than the host "
-"CPU frequency."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15094"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CPU cap now set properly in VMware."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15077"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"NullPointerException is no longer observed while executing the command to "
-"list the public IP in a basic zone created with the default shared NetScaler"
-" EIP and ELB network offering."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15044"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"UI now provides option to view the list of instances which are part of the "
-"guest network."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15026"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"UI in Deploy VM dialog now lists only templates or ISOs depending on which "
-"is selected in previous dialog."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14989"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"In KVM, the Create Instance wizard now shows only templates from the current"
-" (KVM) zone."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14986, CS-14985"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Listing filters works as expected in the ec2-describe-volumes and ec2"
-"-describe-snapshots commands."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14964"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Automatically starting the Console Proxy no longer fails due to its missing "
-"volume on the primary storage"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14907"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"User is now correctly prevented from trying to download an uploaded volume "
-"which has not yet been moved to primary storage."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14879"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"When a user VM is stopped or terminated, the static NAT associated with this"
-" VM is now disabled. This public IP address is no longer owned by this "
-"account and can be associated to any other user VM."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14854"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Only the admin user can change the template permission to Public, so this "
-"option is removed from the UI for domain Admins and regular Users."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14817"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"While checking if network has any external provider, CloudStack will "
-"consider all providers in the network."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14796"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "When deploying a VM with ec2-run-instances, userdata is now encoded."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14770"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"The API returns the keypair information when a VM is deployed with sshkey. "
-"This affects the API commands related to virtual machines "
-"(deployVirtualMachine, listVirtualMachines, ... *VirtualMachine), as well as"
-" the corresponding AWS APIs."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14724"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"UI no longer displays the dropdown list of isolation method choices if "
-"sdn.ovs.controller is false."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14345"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Logout API returns XML header."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Host IPs now associated with appropriate IPs according to traffic type."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14253"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Can now delete and re-create port forwarding rule on same firewall."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14452"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid ""
-"Data disk volumes are now automatically copied from one cluster to another."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-13539"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Windows VM can get IP after reboot."
-msgstr ""
-
-#. Tag: para
+#. Tag: title
 #, no-c-format
-msgid "CS-13537"
+msgid "Upgrade Instructions"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"When user tries to delete a domain that contains sub-domains, an error "
-"message is now sent to convey the reason for the delete failure."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-13153"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "System VMs support HTTP proxy."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-12642"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Added Close button to Select Project list view popup in UI."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-12510"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Deleting and reinserting host_details no longer causes deadlocks."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-12407"
+"This section contains upgrade instructions from prior versions of CloudStack"
+" to Apache CloudStack 4.1.0. We include instructions on upgrading to Apache "
+"CloudStack from pre-Apache versions of Citrix CloudStack (last version prior"
+" to Apache is 3.0.2) and from the releases made while CloudStack was in the "
+"Apache Incubator."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"F5 and Netscaler - when dedicated is selected, capacity field is disabled."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-12111"
+"If you run into any issues during upgrades, please feel free to ask "
+"questions on users@apache.cloudstack.org or dev@apache.cloudstack.org."
 msgstr ""
 
-#. Tag: para
+#. Tag: title
 #, no-c-format
-msgid "Email validation for edit user form."
+msgid "Upgrade from 4.0.x to 4.1.0"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "CS-10928"
+msgid ""
+"This section will guide you from Apache CloudStack 4.0.x versions to "
+"&PRODUCT; 4.1.0."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Network read/write values now always positive numbers."
+msgid "Any steps that are hypervisor-specific will be called out with a note."
 msgstr ""
 
-#. Tag: para
+#. Tag: title
 #, no-c-format
-msgid "CS-15376, CS-15373"
+msgid "Package Structure Changes"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The AWS APIs (EC2 and S3) now listen on the 7080 port and send request to "
-"CloudStack on the 8080 port just as any other clients of CloudStack."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-13944"
+"The package structure for &PRODUCT; has changed significantly since the "
+"4.0.x releases. If you've compiled your own packages, you'll notice that the"
+" package names and the number of packages has changed. This is "
+"<emphasis>not</emphasis> a bug."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The CloudStack 2.2.x to 3.0.x database upgrade for multiple physical "
-"networks is now supported."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15300"
+"However, this <emphasis>does</emphasis> mean that the procedure is not as "
+"simple as an <command>apt-get upgrade</command> or <command>yum "
+"update</command>, so please follow this section carefully."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The admin accounts of a domain now honour the limits imposed on that domain "
-"just like the regular accounts do. A domain admin now is not allowed to "
-"create an unlimited number of instances, volumes, snapshots, and so on."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15396"
+"We recommend reading through this section once or twice before beginning "
+"your upgrade procedure, and working through it on a test system before "
+"working on a production system."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The CloudStack database now contain the UUD information after the 2.2.14 to "
-"3.0.4 upgrade."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15450"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Upgrade from 2.2.14 to 3.0.4 no longer fails on a VMware host."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15449"
+"Most users of &PRODUCT; manage the installation and upgrades of &PRODUCT; "
+"with one of Linux's predominant package systems, RPM or APT. This guide "
+"assumes you'll be using RPM and Yum (for Red Hat Enterprise Linux or "
+"CentOS), or APT and Debian packages (for Ubuntu)."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Running cloudstack-aws-api-register no longer fails with the \"User "
-"registration failed with error: [Errno 113] No route to host\" error."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15455"
+"Create RPM or Debian packages (as appropriate) and a repository from the "
+"4.1.0 source, or check the Apache CloudStack downloads page at <ulink "
+"url=\"http://cloudstack.apache.org/downloads.html\">http://cloudstack.apache.org/downloads.html</ulink>"
+" for package repositories supplied by community members. You will need them "
+"for step <xref linkend=\"upgrade-deb-packages\" /> or step <xref linkend"
+"=\"upgrade-rpm-packages\" />."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The iptable rules are configured to open the awsapi port (7080) as part of "
-"the installation."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15429"
+"Instructions for creating packages from the &PRODUCT; source are in the "
+"<ulink url=\"http://cloudstack.apache.org/docs/en-"
+"US/index.html\">Installation Guide</ulink>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"While creating an instance with data volume, disk offering also is "
-"considered while checking the account limit on volume resources."
+"Stop your management server or servers. Run this on all management server "
+"hosts:"
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-15414"
+msgid "<prompt>#</prompt> service cloud-management stop"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"After the 2.2.14 to 3.0.4 upgrade, the value of the global parameter "
-"xen.guest.network.device is now decrypted before setting the traffic label."
+"If you are running a usage server or usage servers, stop those as well:"
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-15382"
+msgid "<prompt>#</prompt> service cloud-usage stop"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"During 2.2.14 to 3.0.4 upgrade, the hosts no longer go to the Alert state if"
-" destroyed networks existed with non-existent tags prior to upgrade."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15323"
+"Make a backup of your MySQL database. If you run into any issues or need to "
+"roll back the upgrade, this will assist in debugging or restoring your "
+"existing environment. You'll be prompted for your password."
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
 msgid ""
-"CloudStack supports the following Citrix XenServer hotfixes: XS602E003, "
-"XS602E004, and XS602E005."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-15430"
+"<prompt>#</prompt> mysqldump -u root -p cloud &gt; cloudstack-backup.sql"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Create snapshot now fails if creating a snapshot exceeds the snapshot "
-"resource limit for a domain admin or a user account."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14256"
+"Whether you're upgrading a Red Hat/CentOS based system or Ubuntu based "
+"system, you're going to need to stop the CloudStack management server before"
+" proceeding."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Virtual Router no longer remains in starting state for subdomain or user on "
-"a KVM 3.0.1 prerlease host on RHEL 6.2."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-7495"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Implemented a variety of Xen management host improvements."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-8105"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "NFS v4 for primary storage now works as expected on KVM hosts."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-9989"
+"If you have made changes to "
+"<filename>/etc/cloud/management/components.xml</filename>, you'll need to "
+"carry these over manually to the new file, "
+"<filename>/etc/cloudstack/management/componentContext.xml</filename>. This "
+"is not done automatically. (If you're unsure, we recommend making a backup "
+"of the original <filename>components.xml</filename> to be on the safe side."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The error messages returned during VM deployment failure will have much more"
-" details than before."
+"If you are using Ubuntu, follow this procedure to upgrade your packages. If "
+"not, skip to step <xref linkend=\"upgrade-rpm-packages\" />."
 msgstr ""
 
-#. Tag: para
+#. Tag: title
 #, no-c-format
-msgid "CS-12584"
+msgid "Community Packages"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"You can no longer add security groups not supported by the hypervisor in "
-"use."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-12705"
+"This section assumes you're using the community supplied packages for "
+"&PRODUCT;. If you've created your own packages and APT repository, "
+"substitute your own URL for the ones used in these examples."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"When creating a Network offering by using SRX as the service provider for "
-"SourceNAT servcies, an option is given in the CloudStack UI now to set the "
-"source_nat type to \"per Zone\"/\"per account\"."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-12782"
+"The first order of business will be to change the sources list for each "
+"system with &PRODUCT; packages. This means all management servers, and any "
+"hosts that have the KVM agent. (No changes should be necessary for hosts "
+"that are running VMware or Xen.)"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Assigning a VM from Basic to Advanced zone no longer ignores the network ID."
-" A warning message is displayed for VM movements across zones."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-12591"
+"Start by opening "
+"<filename>/etc/apt/sources.list.d/cloudstack.list</filename> on any systems "
+"that have &PRODUCT; packages installed."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "Broadcast Address on the Second Public IP NIC is now corrected."
+msgid "This file should have one line, which contains:"
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-13272"
+msgid "deb http://cloudstack.apt-get.eu/ubuntu precise 4.0"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"When a user is deleted, all the associated properties, such as IPs and "
-"virtual routers, are now deleted."
+msgid "We'll change it to point to the new package repository:"
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-13377"
+msgid "deb http://cloudstack.apt-get.eu/ubuntu precise 4.1"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Creating template from a root disk of a stopped instance now provides an "
-"option to make it a \"Featured template\"."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-13500"
+"If you're using your own package repository, change this line to read as "
+"appropriate for your 4.1.0 repository."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"Reaching the first guest VM by using its public IP from the second guest VM "
-"no longer fails."
+msgid "Now update your apt package list:"
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-13853"
+msgid "$ sudo apt-get update"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The default gateway can no longer be 0.0.0.0 in the Secondary Storage VM "
-"(SSVM)."
+"Now that you have the repository configured, it's time to install the "
+"<filename>cloudstack-management</filename> package. This will pull in any "
+"other dependencies you need."
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-13863"
+msgid "$ sudo apt-get install cloudstack-management"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The queryAsyncJobResult command in XML format now returns the correct UUIDs."
+"You will need to manually install the <filename>cloudstack-agent</filename> "
+"package:"
 msgstr ""
 
-#. Tag: para
-#, no-c-format
-msgid "CS-13867"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "Corrected CSP xenserver-cloud-supp.tgz for XenServer 5.6 and 6.0."
-msgstr ""
-
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-13904"
+msgid "$ sudo apt-get install cloudstack-agent"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"Labels and values for the service offerings CPU and memory are now "
-"consistent."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-13998"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The SSVM kernel panic issue is fixed on XenServer."
+"During the installation of <filename>cloudstack-agent</filename>, APT will "
+"copy your <filename>agent.properties</filename>, <filename>log4j-"
+"cloud.xml</filename>, and <filename>environment.properties</filename> from "
+"<filename>/etc/cloud/agent</filename> to "
+"<filename>/etc/cloudstack/agent</filename>."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "CS-14090"
+msgid "When prompted whether you wish to keep your configuration, say Yes."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The issue is fixed where running the VMware snapshots randomly fails with "
-"the ArrayIndexOutOfBoundsException error."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14021"
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "The java.lang.OutOfMemoryError is fixed on the Management Server."
+"Verify that the file "
+"<filename>/etc/cloudstack/agent/environment.properties</filename> has a line"
+" that reads:"
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
-msgid "CS-14025"
+msgid "paths.script=/usr/share/cloudstack-common"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid ""
-"The Python Eggs are provided to easily package the test client for each "
-"branch of CloudStack."
+msgid "If not, add the line."
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "CS-14068"
+msgid "Restart the agent:"
 msgstr ""
 
-#. Tag: para
+#. Tag: programlisting
 #, no-c-format
 msgid ""
-"Resetting the VM password through the CloudStack UI no longer causes any "
-"error."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14156"
+"\n"
+"service cloud-agent stop\n"
+"killall jsvc\n"
+"service cloudstack-agent start\n"
+"                            "
 msgstr ""
 
 #. Tag: para
 #, no-c-format
 msgid ""
-"The pod which has the administrator's virtual router is no longer selected "
-"while creating the virtual routers for guests."
-msgstr ""
-
-#. Tag: para
-#, no-c-format
-msgid "CS-14182"
-msgstr ""
-
-#. Tag: para
-#, no-c-for

<TRUNCATED>

[3/3] git commit: updated refs/heads/4.1 to 3fe40aa

Posted by se...@apache.org.
[TRANSLATION]: Adding zh-CN translation strings


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3fe40aa1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3fe40aa1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3fe40aa1

Branch: refs/heads/4.1
Commit: 3fe40aa1b7b18ef9aad87a551224580c32f3203e
Parents: 959039c
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Fri Apr 12 09:44:01 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Fri Apr 12 09:44:01 2013 -0400

----------------------------------------------------------------------
 docs/zh-CN/Book_Info_Release_Notes_4-0.po          |   15 +-
 docs/zh-CN/Release_Notes.po                        | 4791 +++------------
 docs/zh-CN/about-zones.po                          |   12 +-
 docs/zh-CN/added-API-commands.po                   |    8 +-
 docs/zh-CN/api-reference.po                        |    6 +-
 docs/zh-CN/build-rpm.po                            |   56 +-
 docs/zh-CN/building-marvin.po                      |    8 +-
 docs/zh-CN/building-with-maven-steps.po            |   11 +-
 docs/zh-CN/citrix-xenserver-installation.po        |   10 +-
 docs/zh-CN/cloudmonkey.po                          |   10 +-
 docs/zh-CN/configure-vpn.po                        |    6 +-
 docs/zh-CN/console-proxy.po                        |    7 +-
 docs/zh-CN/feature-overview.po                     |   23 +-
 docs/zh-CN/getting-release.po                      |   14 +-
 docs/zh-CN/global-config.po                        |  162 +-
 docs/zh-CN/guest-nw-usage-with-traffic-sentinel.po |   13 +-
 docs/zh-CN/hypervisor-host-install-libvirt.po      |    4 +-
 docs/zh-CN/ip-forwarding-firewalling.po            |   21 +-
 docs/zh-CN/management-server-install-prepare-os.po |    8 +-
 docs/zh-CN/management-server-lb.po                 |   19 +-
 docs/zh-CN/minimum-system-requirements.po          |    8 +-
 docs/zh-CN/provisioning-steps-overview.po          |   40 +-
 docs/zh-CN/provisioning-steps.po                   |   15 +-
 docs/zh-CN/remove-vpc.po                           |    8 +-
 docs/zh-CN/response-formats.po                     |   16 +-
 docs/zh-CN/vmware-install.po                       |    2 +-
 docs/zh-CN/vmware-requirements.po                  |    8 +-
 27 files changed, 1310 insertions(+), 3991 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3fe40aa1/docs/zh-CN/Book_Info_Release_Notes_4-0.po
----------------------------------------------------------------------
diff --git a/docs/zh-CN/Book_Info_Release_Notes_4-0.po b/docs/zh-CN/Book_Info_Release_Notes_4-0.po
index ffabc10..d6c428b 100644
--- a/docs/zh-CN/Book_Info_Release_Notes_4-0.po
+++ b/docs/zh-CN/Book_Info_Release_Notes_4-0.po
@@ -17,9 +17,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Apache CloudStack Docs\n"
-"POT-Creation-Date: 2013-03-19T13:38:01\n"
-"PO-Revision-Date: 2013-02-02 18:31+0000\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2013-04-12T11:19:37\n"
+"PO-Revision-Date: 2013-04-12 11:27+0000\n"
+"Last-Translator: sebgoa <ru...@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,12 +29,7 @@ msgstr ""
 
 #. Tag: title
 #, no-c-format
-msgid "Version 4.0.0-incubating Release Notes"
-msgstr ""
-
-#. Tag: subtitle
-#, no-c-format
-msgid "Revised October 17, 2012 19:49 UTC"
+msgid "Version 4.1.0 Release Notes"
 msgstr ""
 
 #. Tag: productname
@@ -44,5 +39,5 @@ msgstr "Apache CloudStack"
 
 #. Tag: para
 #, no-c-format
-msgid "Release notes for the Apache CloudStack 4.0.0-incubating release."
+msgid "Release notes for the Apache CloudStack 4.1.0 release."
 msgstr ""