Merge "Imported Translations from Transifex"

doc/install-guide/locale/zh_CN.po

@@ -1,6 +1,7 @@
 # 
 # Translators:
 # qboster <qboster@gmail.com>, 2014
+# Heyzhu <ding-haiyang@hotmail.com>, 2014
 # Dongliang Yu <yudl.nju@gmail.com>, 2013
 # kaizh <zakir.exe@gmail.com>, 2013-2014
 # nickyniu <nickyniu@gmail.com>, 2014
@@ -12,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-05-09 17:37+0000\n"
-"PO-Revision-Date: 2014-05-09 15:20+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"POT-Creation-Date: 2014-05-12 02:56+0000\n"
+"PO-Revision-Date: 2014-05-11 17:20+0000\n"
+"Last-Translator: Heyzhu <ding-haiyang@hotmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3510,7 +3511,7 @@ msgstr ""
 msgid ""
 "The service ID is randomly generated and is different from the one shown "
 "here."
-msgstr ""
+msgstr "服务器 ID 是随机生成的并且和显示在这里的不一样。"
 
 #: ./doc/install-guide/section_keystone-services.xml40(para)
 msgid ""
@@ -3691,7 +3692,7 @@ msgstr "因为该例子中DHCP代理和L3代理运行在一个节点上，你必
 
 #: ./doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml55(para)
 msgid "This table describes the nodes:"
-msgstr ""
+msgstr "这张表描述了节点："
 
 #: ./doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml61(th)
 #: ./doc/install-guide/section_neutron-provider-router-with-private_networks.xml31(th)
@@ -3801,7 +3802,7 @@ msgstr "相关的Compute服务被安装，配置并且在运行。"
 msgid ""
 "Glance is installed, configured, and running. In addition, an image named "
 "<literal>tty</literal> must be present."
-msgstr ""
+msgstr "Glance 已经安装和配置完毕并且正在运行。此外，镜像 <literal>tty</literal> 必须存在。"
 
 #: ./doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml135(para)
 msgid ""
@@ -3873,7 +3874,7 @@ msgstr "更新插件配置文件，<filename>/etc/neutron/plugins/openvswitch/ov
 
 #: ./doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml210(para)
 msgid "Start the Networking server."
-msgstr ""
+msgstr "启动网络服务器。"
 
 #: ./doc/install-guide/section_neutron-per-tenant-routers-with-private-networks.xml211(para)
 msgid ""
@@ -9628,17 +9629,17 @@ msgstr "存储网络（RFC1918 IP范围，公开路由不可达）"
 msgid ""
 "Manages all inter-server communications within the Object Storage "
 "infrastructure."
-msgstr ""
+msgstr "管理所有在对象存储基础设施中的服务器间通讯。"
 
 #: ./doc/install-guide/object-storage/section_object-storage-network-planning.xml64(para)
 msgid "Minimum size: one IP address for each storage node and proxy server."
-msgstr ""
+msgstr "最小规格：每个存储节点和代理服务器对应一个IP地址。"
 
 #: ./doc/install-guide/object-storage/section_object-storage-network-planning.xml66(para)
 msgid ""
 "Recommended size: as above, with room for expansion to the largest your "
 "cluster size. For example, 255 or CIDR /24."
-msgstr ""
+msgstr "推荐规格：如上，为最大化你的集群规模预留扩展空间。例如，255 或者 CIDR /24。"
 
 #: ./doc/install-guide/object-storage/section_object-storage-network-planning.xml72(term)
 msgid "Replication Network (RFC1918 IP Range, not publicly routable)"

doc/training-guides/locale/fr.po

@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-05-11 05:15+0000\n"
-"PO-Revision-Date: 2014-05-10 17:20+0000\n"
+"POT-Creation-Date: 2014-05-12 02:57+0000\n"
+"PO-Revision-Date: 2014-05-11 18:20+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -10181,7 +10181,7 @@ msgstr ""
 
 #: ./doc/training-guides/bk001-ch004-associate-controller-node-quiz.xml220(para)
 msgid "Reboot"
-msgstr ""
+msgstr "Redémarrage"
 
 #: ./doc/training-guides/bk001-ch004-associate-controller-node-quiz.xml223(para)
 msgid "Evacuate"

doc/user-guide/locale/fr.po

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenStack Manuals\n"
-"POT-Creation-Date: 2014-05-09 17:37+0000\n"
-"PO-Revision-Date: 2014-05-09 17:38+0000\n"
+"POT-Creation-Date: 2014-05-12 02:57+0000\n"
+"PO-Revision-Date: 2014-05-11 18:20+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/openstack-manuals-i18n/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -3349,7 +3349,7 @@ msgstr "Démarrer"
 
 #: ./doc/user-guide/app_cheat_sheet.xml250(td)
 msgid "Rescue"
-msgstr ""
+msgstr "Secours"
 
 #: ./doc/user-guide/app_cheat_sheet.xml256(td)
 msgid "Resize"
@@ -3357,11 +3357,11 @@ msgstr "Redimensionner"
 
 #: ./doc/user-guide/app_cheat_sheet.xml264(td)
 msgid "Rebuild"
-msgstr ""
+msgstr "Reconstruire"
 
 #: ./doc/user-guide/app_cheat_sheet.xml271(td)
 msgid "Reboot"
-msgstr ""
+msgstr "Redémarrage"
 
 #: ./doc/user-guide/app_cheat_sheet.xml278(td)
 msgid "Inject user data and files into an instance"