Merge "Imported Translations from Transifex"

ceilometer/locale/ceilometer-log-error.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2015.1.dev168\n"
+"Project-Id-Version: ceilometer 2015.1.dev188\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,6 +39,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr ""

ceilometer/locale/ceilometer-log-warning.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2015.1.dev168\n"
+"Project-Id-Version: ceilometer 2015.1.dev188\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,9 +39,15 @@ msgid ""
 "with False"
 msgstr ""
 
+#: ceilometer/cmd/polling.py:51
+#, python-format
+msgid "Duplicated values: %s found in CLI options, auto de-duplidated"
+msgstr ""
+
 #: ceilometer/compute/pollsters/disk.py:133
 #: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
+#: ceilometer/compute/pollsters/memory.py:92
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
 msgid ""
@@ -50,6 +56,7 @@ msgid ""
 msgstr ""
 
 #: ceilometer/compute/pollsters/memory.py:54
+#: ceilometer/compute/pollsters/memory.py:97
 #, python-format
 msgid ""
 "Cannot inspect data of %(pollster)s for %(instance_id)s, non-fatal "

ceilometer/locale/ceilometer.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2015.1.dev168\n"
+"Project-Id-Version: ceilometer 2015.1.dev188\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -758,6 +758,7 @@ msgstr ""
 #: ceilometer/compute/pollsters/disk.py:604
 #: ceilometer/compute/pollsters/disk.py:699
 #: ceilometer/compute/pollsters/memory.py:47
+#: ceilometer/compute/pollsters/memory.py:90
 #: ceilometer/compute/pollsters/net.py:106
 #, python-format
 msgid "Exception while getting samples %s"
@@ -841,12 +842,27 @@ msgstr ""
 msgid "Could not get Memory Usage for %(id)s: %(e)s"
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:73
+#, python-format
+msgid "Checking resident memory for instance %s"
+msgstr ""
+
+#: ceilometer/compute/pollsters/memory.py:78
+#, python-format
+msgid "RESIDENT MEMORY: %(instance)s %(resident)f"
+msgstr ""
+
+#: ceilometer/compute/pollsters/memory.py:103
+#, python-format
+msgid "Obtaining Resident Memory is not implemented for %s"
+msgstr ""
+
 #: ceilometer/compute/pollsters/net.py:92
 #, python-format
 msgid "checking net info for instance %s"
 msgstr ""
 
-#: ceilometer/compute/virt/inspector.py:282
+#: ceilometer/compute/virt/inspector.py:290
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr ""

ceilometer/locale/de/LC_MESSAGES/ceilometer-log-error.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/ceilometer/"
 "language/de/)\n"
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "in Schleifenaufruf mit festgelegter Dauer"

ceilometer/locale/en_AU/LC_MESSAGES/ceilometer-log-error.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_AU/)\n"
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "in fixed duration looping call"

ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-error.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_GB/)\n"
@@ -42,6 +42,11 @@ msgstr "Error sending a heartbeat to coordination backend."
 msgid "Error getting group membership info from coordination backend."
 msgstr "Error getting group membership info from coordination backend."
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "in fixed duration looping call"

ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 21:03+0000\n"
+"PO-Revision-Date: 2015-03-13 12:57+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_GB/)\n"
@@ -42,9 +42,15 @@ msgid ""
 "with False"
 msgstr ""
 
+#: ceilometer/cmd/polling.py:51
+#, python-format
+msgid "Duplicated values: %s found in CLI options, auto de-duplidated"
+msgstr ""
+
 #: ceilometer/compute/pollsters/disk.py:133
 #: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
+#: ceilometer/compute/pollsters/memory.py:92
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
 msgid ""
@@ -53,6 +59,7 @@ msgid ""
 msgstr ""
 
 #: ceilometer/compute/pollsters/memory.py:54
+#: ceilometer/compute/pollsters/memory.py:97
 #, python-format
 msgid ""
 "Cannot inspect data of %(pollster)s for %(instance_id)s, non-fatal reason: "

ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 21:03+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) "
 "(http://www.transifex.com/projects/p/ceilometer/language/en_GB/)\n"
@@ -780,6 +780,7 @@ msgstr "CPUTIME USAGE: %(instance)s %(time)d"
 #: ceilometer/compute/pollsters/disk.py:604
 #: ceilometer/compute/pollsters/disk.py:699
 #: ceilometer/compute/pollsters/memory.py:47
+#: ceilometer/compute/pollsters/memory.py:90
 #: ceilometer/compute/pollsters/net.py:106
 #, python-format
 msgid "Exception while getting samples %s"
@@ -863,12 +864,27 @@ msgstr "Obtaining Memory Usage is not implemented for %s"
 msgid "Could not get Memory Usage for %(id)s: %(e)s"
 msgstr "Could not get Memory Usage for %(id)s: %(e)s"
 
+#: ceilometer/compute/pollsters/memory.py:73
+#, python-format
+msgid "Checking resident memory for instance %s"
+msgstr ""
+
+#: ceilometer/compute/pollsters/memory.py:78
+#, python-format
+msgid "RESIDENT MEMORY: %(instance)s %(resident)f"
+msgstr ""
+
+#: ceilometer/compute/pollsters/memory.py:103
+#, python-format
+msgid "Obtaining Resident Memory is not implemented for %s"
+msgstr ""
+
 #: ceilometer/compute/pollsters/net.py:92
 #, python-format
 msgid "checking net info for instance %s"
 msgstr "checking net info for instance %s"
 
-#: ceilometer/compute/virt/inspector.py:282
+#: ceilometer/compute/virt/inspector.py:290
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Unable to load the hypervisor inspector: %s"

ceilometer/locale/es/LC_MESSAGES/ceilometer-log-error.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/ceilometer/"
 "language/es/)\n"
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "en llamada en bucle de duración fija"

ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-error.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
 "language/fr/)\n"
@@ -43,6 +43,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "dans l'appel en boucle de durée fixe"

ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 21:03+0000\n"
+"PO-Revision-Date: 2015-03-13 12:57+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
 "language/fr/)\n"
@@ -43,9 +43,15 @@ msgid ""
 "with False"
 msgstr ""
 
+#: ceilometer/cmd/polling.py:51
+#, python-format
+msgid "Duplicated values: %s found in CLI options, auto de-duplidated"
+msgstr ""
+
 #: ceilometer/compute/pollsters/disk.py:133
 #: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
+#: ceilometer/compute/pollsters/memory.py:92
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
 msgid ""
@@ -54,6 +60,7 @@ msgid ""
 msgstr ""
 
 #: ceilometer/compute/pollsters/memory.py:54
+#: ceilometer/compute/pollsters/memory.py:97
 #, python-format
 msgid ""
 "Cannot inspect data of %(pollster)s for %(instance_id)s, non-fatal reason: "

ceilometer/locale/ja/LC_MESSAGES/ceilometer-log-error.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/ceilometer/"
 "language/ja/)\n"
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "一定期間の呼び出しループ"

ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-error.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/"
 "ceilometer/language/ko_KR/)\n"
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "고정 기간 루프 호출에서"

ceilometer/locale/pt_BR/LC_MESSAGES/ceilometer-log-error.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "ceilometer/language/pt_BR/)\n"
@@ -41,6 +41,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "em uma chamada de laço de duração fixa"

ceilometer/locale/vi_VN/LC_MESSAGES/ceilometer-log-error.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-17 20:34+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
 "ceilometer/language/vi_VN/)\n"
@@ -42,6 +42,11 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "trong cuộc gọi vòng lặp thời khoảng cố định "

ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-error.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 20:49+0000\n"
+"PO-Revision-Date: 2015-03-18 03:34+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -43,6 +43,11 @@ msgstr "无法发送心跳信息到协调器后端"
 msgid "Error getting group membership info from coordination backend."
 msgstr "从协调器后端获取组成员信息时出错"
 
+#: ceilometer/compute/pollsters/memory.py:106
+#, python-format
+msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
+msgstr "无法为%(id)s获取常驻内存使用量RSS： %(e)s"
+
 #: ceilometer/openstack/common/loopingcall.py:95
 msgid "in fixed duration looping call"
 msgstr "在固定时段内循环调用"
@@ -59,13 +64,13 @@ msgstr "存在未处理的异常"
 #: ceilometer/publisher/kafka_broker.py:177
 #, python-format
 msgid "Failed to connect to Kafka service: %s"
-msgstr ""
+msgstr "无法连接到Kafka服务：%s"
 
 #: ceilometer/publisher/kafka_broker.py:158
 msgid "Failed to retry to send sample data with max_retry times"
-msgstr ""
+msgstr "尝试发送数据达到最大重试次数后仍失败"
 
 #: ceilometer/publisher/kafka_broker.py:198
 #, python-format
 msgid "Failed to send sample data: %s"
-msgstr ""
+msgstr "发送指标数据失败：%s"

ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-info.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 21:03+0000\n"
+"PO-Revision-Date: 2015-03-18 03:24+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -40,10 +40,10 @@ msgstr "已离开分组%s"
 msgid "Dropping event data with TTL %d"
 msgstr "正在根据TTL: %d丢弃事件数据"
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#: ceilometer/event/storage/impl_sqlalchemy.py:431
 #, python-format
 msgid "%d events are removed from database"
-msgstr ""
+msgstr "%d个事件从数据库中被移除"
 
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format

ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-warning.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 21:03+0000\n"
+"PO-Revision-Date: 2015-03-18 03:38+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -25,6 +25,8 @@ msgid ""
 "Non-metric meters may be collected. It is highly advisable to disable these "
 "meters using ceilometer.conf or the pipeline.yaml"
 msgstr ""
+"非计量指标也许会被收集。强烈建议在ceilometer.conf或者pipeline.yaml中禁用这些"
+"指标"
 
 #: ceilometer/agent/discovery/endpoint.py:42
 #, python-format
@@ -42,9 +44,15 @@ msgid ""
 "with False"
 msgstr "pecan_debug无法被启用，如果api_workers>1，该值会被重置为False"
 
+#: ceilometer/cmd/polling.py:51
+#, python-format
+msgid "Duplicated values: %s found in CLI options, auto de-duplidated"
+msgstr "重复值：发现控制台参数%s，自动去除重复项"
+
 #: ceilometer/compute/pollsters/disk.py:133
 #: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
+#: ceilometer/compute/pollsters/memory.py:92
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
 msgid ""
@@ -53,6 +61,7 @@ msgid ""
 msgstr "采集器%(pollster)s在采集数据点时，虚拟机%(instance_id)s被关闭：%(exc)s"
 
 #: ceilometer/compute/pollsters/memory.py:54
+#: ceilometer/compute/pollsters/memory.py:97
 #, python-format
 msgid ""
 "Cannot inspect data of %(pollster)s for %(instance_id)s, non-fatal reason: "
@@ -78,10 +87,10 @@ msgstr "未知的发布策略(%s)，强制使用默认策略"
 #: ceilometer/publisher/kafka_broker.py:149
 #, python-format
 msgid "Failed to publish %d datum"
-msgstr ""
+msgstr "%d个数据发送失败"
 
 #: ceilometer/publisher/kafka_broker.py:170
 #, python-format
 msgid ""
 "Kafka Publisher max local queue length is exceeded, dropping %d oldest data"
-msgstr ""
+msgstr "Kafka发布器本地队列超过本地最大长度，正在丢弃%d个最老的数据"

ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po

@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-12 06:06+0000\n"
+"POT-Creation-Date: 2015-03-18 06:10+0000\n"
-"PO-Revision-Date: 2015-03-11 21:03+0000\n"
+"PO-Revision-Date: 2015-03-18 03:44+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
 "Language-Team: Chinese (China) "
 "(http://www.transifex.com/projects/p/ceilometer/language/zh_CN/)\n"
 "Plural-Forms: nplurals=1; plural=0\n"
@@ -149,12 +149,12 @@ msgstr "遇到错误%(name)s：%(error)s，继续执行"
 #: ceilometer/agent/base.py:244
 #, python-format
 msgid "Skip loading extension for %s"
-msgstr ""
+msgstr "跳过为%s加载扩展"
 
 #: ceilometer/agent/base.py:248
 #, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
-msgstr ""
+msgstr "无法为%(name)s引入扩展：%(error)s"
 
 #: ceilometer/agent/base.py:357
 #, python-format
@@ -286,7 +286,7 @@ msgstr "警报统计信息获取失败"
 #: ceilometer/alarm/evaluator/gnocchi.py:106
 #, python-format
 msgid "alarm stats retrieval failed: %s"
-msgstr ""
+msgstr "告警状态检索失败：%s"
 
 #: ceilometer/alarm/evaluator/gnocchi.py:121
 #: ceilometer/alarm/evaluator/threshold.py:56
@@ -466,7 +466,7 @@ msgstr ""
 #: ceilometer/alarm/partition/coordination.py:298
 #, python-format
 msgid "%s has no assigned alarms to evaluate"
-msgstr ""
+msgstr "%s没有被指派告警以供评估"
 
 #: ceilometer/alarm/partition/coordination.py:302
 #, python-format
@@ -766,6 +766,7 @@ msgstr "虚拟机%(instance)s的CPU时间为%(time)d"
 #: ceilometer/compute/pollsters/disk.py:604
 #: ceilometer/compute/pollsters/disk.py:699
 #: ceilometer/compute/pollsters/memory.py:47
+#: ceilometer/compute/pollsters/memory.py:90
 #: ceilometer/compute/pollsters/net.py:106
 #, python-format
 msgid "Exception while getting samples %s"
@@ -827,7 +828,7 @@ msgstr "%(inspector)s无法为采集器%(pollster)s提供数据"
 #: ceilometer/compute/pollsters/disk.py:713
 #, python-format
 msgid "Ignoring instance %(name)s (%(instance_id)s) : %(error)s"
-msgstr ""
+msgstr "忽略虚拟机%(name)s (%(instance_id)s) : %(error)s"
 
 #: ceilometer/compute/pollsters/memory.py:31
 #, python-format
@@ -849,12 +850,27 @@ msgstr "获取内存使用信息尚未在%s中实现"
 msgid "Could not get Memory Usage for %(id)s: %(e)s"
 msgstr "无法为%(id)s获取内存使用信息：%(e)s"
 
+#: ceilometer/compute/pollsters/memory.py:73
+#, python-format
+msgid "Checking resident memory for instance %s"
+msgstr "正在检查虚拟机%s的常驻内存RSS"
+
+#: ceilometer/compute/pollsters/memory.py:78
+#, python-format
+msgid "RESIDENT MEMORY: %(instance)s %(resident)f"
+msgstr ""
+
+#: ceilometer/compute/pollsters/memory.py:103
+#, python-format
+msgid "Obtaining Resident Memory is not implemented for %s"
+msgstr ""
+
 #: ceilometer/compute/pollsters/net.py:92
 #, python-format
 msgid "checking net info for instance %s"
 msgstr "为虚拟机%s检查网络信息"
 
-#: ceilometer/compute/virt/inspector.py:282
+#: ceilometer/compute/virt/inspector.py:290
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "无法加载管理程序的探测器：%s"
@@ -1120,17 +1136,17 @@ msgstr "运行ipmitool时失败了"
 #: ceilometer/ipmi/pollsters/node.py:66
 #, python-format
 msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr ""
+msgstr "拉取%(name)s失败了%(cnt)s次！"
 
 #: ceilometer/ipmi/pollsters/node.py:71 ceilometer/ipmi/pollsters/sensor.py:74
 #, python-format
 msgid "Pollster for %s is disabled!"
-msgstr ""
+msgstr "%s的采集器被禁用"
 
 #: ceilometer/ipmi/pollsters/sensor.py:68
 #, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
-msgstr ""
+msgstr "拉取%(mtr)s传感器失败了%(cnt)s次！"
 
 #: ceilometer/network/floatingip.py:54
 #, python-format
@@ -1189,12 +1205,12 @@ msgstr "请求无法连接到OpenDaylight的北向REST接口"
 
 #: ceilometer/objectstore/rgw.py:80
 msgid "Radosgw endpoint not found"
-msgstr ""
+msgstr "Radosgw服务入口未找到"
 
 #: ceilometer/objectstore/rgw_client.py:48
 #, python-format
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
-msgstr ""
+msgstr "RGW AdminOps接口返回%(status)s %(reason)s"
 
 #: ceilometer/objectstore/swift.py:76
 msgid "Swift endpoint not found"