Imported Translations from Zanata

For more information about this automatic import see:
https://wiki.openstack.org/wiki/Translations/Infrastructure

Change-Id: I7ce09e36757c6da5e3e37fb38f8a2cbb449ae9d2

10 files changed, 133 insertions, 138 deletions

diff --git a/ceilometer/locale/ceilometer-log-error.pot b/ceilometer/locale/ceilometer-log-error.pot
index a0aacd16..ffa5f25a 100644
--- a/ceilometer/locale/ceilometer-log-error.pot
+++ b/ceilometer/locale/ceilometer-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0b4.dev6\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-07 06:08+0000\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
+"POT-Creation-Date: 2016-04-21 07:16+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
 
-#: ceilometer/collector.py:176
+#: ceilometer/collector.py:163
 #, python-format
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
 
 #: ceilometer/event/storage/impl_elasticsearch.py:110
 #: ceilometer/event/storage/impl_hbase.py:121
-#: ceilometer/event/storage/impl_sqlalchemy.py:203
-#: ceilometer/event/storage/impl_sqlalchemy.py:205
+#: ceilometer/event/storage/impl_sqlalchemy.py:207
+#: ceilometer/event/storage/impl_sqlalchemy.py:209
 #: ceilometer/event/storage/pymongo_base.py:69
 #, python-format
 msgid "Failed to record event: %s"
diff --git a/ceilometer/locale/ceilometer-log-info.pot b/ceilometer/locale/ceilometer-log-info.pot
index 091dc530..bed5888c 100644
--- a/ceilometer/locale/ceilometer-log-info.pot
+++ b/ceilometer/locale/ceilometer-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0b3.dev49\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-02-08 06:51+0000\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
+"POT-Creation-Date: 2016-04-21 07:16+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"
@@ -17,21 +17,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
 
-#: ceilometer/coordination.py:87
+#: ceilometer/coordination.py:86
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:136
+#: ceilometer/coordination.py:135
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:157
+#: ceilometer/coordination.py:156
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
 
-#: ceilometer/declarative.py:165
+#: ceilometer/declarative.py:174
 #, python-format
 msgid "Definitions: %s"
 msgstr ""
@@ -64,17 +64,17 @@ msgstr ""
 msgid "Detected change in pipeline configuration."
 msgstr ""
 
-#: ceilometer/agent/manager.py:178
+#: ceilometer/agent/manager.py:177
 #, python-format
 msgid "Skip pollster %(name)s, no %(p_context)sresources found this cycle"
 msgstr ""
 
-#: ceilometer/agent/manager.py:183
+#: ceilometer/agent/manager.py:182
 #, python-format
 msgid "Polling pollster %(poll)s in the context of %(src)s"
 msgstr ""
 
-#: ceilometer/agent/manager.py:487
+#: ceilometer/agent/manager.py:486
 msgid "Reconfiguring polling tasks."
 msgstr ""
 
@@ -111,7 +111,7 @@ msgid "Nothing to clean, database event time to live is disabled"
 msgstr ""
 
 #: ceilometer/event/storage/impl_elasticsearch.py:107
-#: ceilometer/event/storage/impl_sqlalchemy.py:201
+#: ceilometer/event/storage/impl_sqlalchemy.py:205
 #: ceilometer/event/storage/pymongo_base.py:67
 #, python-format
 msgid "Duplicate event detected, skipping it: %s"
@@ -122,7 +122,7 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:439
+#: ceilometer/event/storage/impl_sqlalchemy.py:443
 #, python-format
 msgid "%d events are removed from database"
 msgstr ""
@@ -142,21 +142,21 @@ msgstr ""
 msgid "Dropping metering data with TTL %d"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:368
+#: ceilometer/storage/impl_sqlalchemy.py:372
 #, python-format
 msgid "%d samples removed from database"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:404
+#: ceilometer/storage/impl_sqlalchemy.py:408
 msgid "Expired residual resource and meter definition data"
 msgstr ""
 
-#: ceilometer/storage/mongo/utils.py:259
+#: ceilometer/storage/mongo/utils.py:260
 #, python-format
 msgid "Connecting to %(db)s on %(nodelist)s"
 msgstr ""
 
-#: ceilometer/storage/mongo/utils.py:462
+#: ceilometer/storage/mongo/utils.py:463
 #, python-format
 msgid "Index %s will be recreate."
 msgstr ""
diff --git a/ceilometer/locale/ceilometer-log-warning.pot b/ceilometer/locale/ceilometer-log-warning.pot
index cc279364..4af95da7 100644
--- a/ceilometer/locale/ceilometer-log-warning.pot
+++ b/ceilometer/locale/ceilometer-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0b4.dev34\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-11 06:17+0000\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
+"POT-Creation-Date: 2016-04-21 07:16+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"
@@ -60,21 +60,21 @@ msgid ""
 "with False"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/root.py:123
+#: ceilometer/api/controllers/v2/root.py:128
 msgid "Can't connect to keystone, assuming gnocchi is disabled and retry later"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/root.py:127
+#: ceilometer/api/controllers/v2/root.py:132
 msgid ""
 "ceilometer-api started with gnocchi enabled. The resources/meters/samples"
 " URLs are disabled."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/root.py:149
+#: ceilometer/api/controllers/v2/root.py:154
 msgid "Can't connect to keystone, assuming aodh is disabled and retry later."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/root.py:152
+#: ceilometer/api/controllers/v2/root.py:157
 msgid ""
 "ceilometer-api started with aodh enabled. Alarms URLs will be redirected "
 "to aodh endpoint."
diff --git a/ceilometer/locale/ceilometer.pot b/ceilometer/locale/ceilometer.pot
index fbb221f1..180a557a 100644
--- a/ceilometer/locale/ceilometer.pot
+++ b/ceilometer/locale/ceilometer.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0rc2.dev9\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-29 06:16+0000\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
+"POT-Creation-Date: 2016-04-21 07:16+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"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.2.0\n"
 
-#: ceilometer/collector.py:134
+#: ceilometer/collector.py:123
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr ""
 
-#: ceilometer/collector.py:141
+#: ceilometer/collector.py:130
 msgid "UDP: Unable to store meter"
 msgstr ""
 
diff --git a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-error.po b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-error.po
index bc2a6736..b0256ef0 100644
--- a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-error.po
+++ b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-error.po
@@ -1,13 +1,13 @@
-# SeYeon Lee <sy_lee@kr.ibm.com>, 2016. #zanata
+# Sungjin Kang <gang.sungjin@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0rc2.dev1\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-20 20:02+0000\n"
+"POT-Creation-Date: 2016-04-07 10:59+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-21 03:28+0000\n"
+"PO-Revision-Date: 2016-04-07 03:38+0000\n"
 "Last-Translator: SeYeon Lee <sy_lee@kr.ibm.com>\n"
 "Language-Team: Korean (South Korea)\n"
 "Language: ko-KR\n"
@@ -27,7 +27,7 @@ msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr "디스패처에서 %s을(를) 처리하지 못하여 다시 대기열에 둡니다."
 
 msgid "Error connecting to coordination backend."
-msgstr "조정 백엔드에 연결하는 중에 오류가 발생했습니다."
+msgstr "조정 백엔드를 연결하는 중에 오류가 발생했습니다."
 
 msgid "Error getting group membership info from coordination backend."
 msgstr "조정 백엔드에서 그룹 멤버십 정보를 가져오는 중에 오류가 발생했습니다."
@@ -39,14 +39,14 @@ msgstr ""
 
 #, python-format
 msgid "Error loading meter definition : %(err)s"
-msgstr "미터 정의 로드 오류 : %(err)s"
+msgstr "측정 정의 로드 오류 : %(err)s"
 
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr "이벤트 처리 중 오류가 발생하므로 삭제됨: %s"
 
 msgid "Error sending a heartbeat to coordination backend."
-msgstr "하트비트를 조정 백엔드에 보내는 중에 오류가 발생했습니다."
+msgstr "하트비트를 조정 백엔드에서 보내는 중에 오류가 발생했습니다."
 
 msgid "Fail to process a notification"
 msgstr "알림을 처리하는 데 실패"
@@ -63,11 +63,11 @@ msgstr "Kafka 서비스에 연결하는 데 실패: %s"
 
 #, python-format
 msgid "Failed to connect to db, purpose %(purpose)s re-try later: %(err)s"
-msgstr "db에 연결하는 데 실패, %(purpose)s 용도를 나중에 다시 시도: %(err)s"
+msgstr "DB에 연결하는 데 실패, %(purpose)s 용도를 나중에 다시 시도: %(err)s"
 
 #, python-format
 msgid "Failed to connect to db, purpose %(purpose)s retry later: %(err)s"
-msgstr "db에 연결하는 데 실패, %(purpose)s 용도를 나중에 다시 시도: %(err)s"
+msgstr "DB에 연결하는 데 실패, %(purpose)s 용도를 나중에 다시 시도: %(err)s"
 
 #, python-format
 msgid "Failed to load resource due to error %s"
diff --git a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-info.po b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-info.po
index 933cf6a8..4511135a 100644
--- a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-info.po
+++ b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-info.po
@@ -1,13 +1,13 @@
-# SeYeon Lee <sy_lee@kr.ibm.com>, 2016. #zanata
+# Sungjin Kang <gang.sungjin@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0rc2.dev1\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-20 20:02+0000\n"
+"POT-Creation-Date: 2016-04-07 10:58+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-21 03:56+0000\n"
+"PO-Revision-Date: 2016-04-07 03:39+0000\n"
 "Last-Translator: SeYeon Lee <sy_lee@kr.ibm.com>\n"
 "Language-Team: Korean (South Korea)\n"
 "Language: ko-KR\n"
@@ -106,7 +106,7 @@ msgstr "알림 에이전트와 리스너를 다시 로드합니다."
 
 #, python-format
 msgid "Skip pollster %(name)s, no %(p_context)sresources found this cycle"
-msgstr "pollster %(name)s 건너뛰기, %(p_context)s 자원에서 이 주기를 발견함"
+msgstr "Pollster %(name)s 건너뛰기, %(p_context)s 자원에서 이 주기를 발견함"
 
 #, python-format
 msgid "Starting server in PID %s"
diff --git a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-warning.po b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-warning.po
index 2b77a9db..64ded387 100644
--- a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-warning.po
+++ b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer-log-warning.po
@@ -1,13 +1,13 @@
-# SeYeon Lee <sy_lee@kr.ibm.com>, 2016. #zanata
+# Sungjin Kang <gang.sungjin@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0rc2.dev1\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-20 20:02+0000\n"
+"POT-Creation-Date: 2016-04-07 10:59+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-21 04:18+0000\n"
+"PO-Revision-Date: 2016-04-07 03:34+0000\n"
 "Last-Translator: SeYeon Lee <sy_lee@kr.ibm.com>\n"
 "Language-Team: Korean (South Korea)\n"
 "Language: ko-KR\n"
@@ -16,12 +16,12 @@ msgstr ""
 
 msgid "Can't connect to keystone, assuming aodh is disabled and retry later."
 msgstr ""
-"keystone에 연결할 수 없습니다 . aodh가 사용되지 않는다고 가정하여 나중에 다"
+"Keystone에 연결할 수 없습니다 . Aodh가 사용되지 않는다고 가정하여 나중에 다"
 "시 시도합니다."
 
 msgid "Can't connect to keystone, assuming gnocchi is disabled and retry later"
 msgstr ""
-"keystone에 연결할 수 없습니다. gnocchi가 사용되지 않는다고 가정하여 나중에 다"
+"Keystone에 연결할 수 없습니다. Gnocchi가 사용되지 않는다고 가정하여 나중에 다"
 "시 시도합니다."
 
 msgid ""
@@ -60,7 +60,7 @@ msgid ""
 "Failed to parse date from set fields, both fields %(start)s and %(end)s must "
 "be datetime: %(err)s"
 msgstr ""
-"설정 필드에서 데이터를 구문 분석하는 데 실패, 두 필드 %(start)s 및 %(end)s은"
+"설정 필드에서 데이터를 구문 분석하는 데 실패, 두 필드 %(start)s 와 %(end)s은"
 "(는) 모두 datetime임: %(err)s"
 
 #, python-format
@@ -92,7 +92,7 @@ msgstr " %(name)s, %(service_type)s 서비스 건너뛰기는 keystone에 등록
 
 #, python-format
 msgid "Skipping duplicate meter definition %s"
-msgstr "중복 미터 정의 %s 건너뛰기"
+msgstr "중복 측정 정의 %s 건너뛰기"
 
 msgid ""
 "Timedelta plugin is required two timestamp fields to create timedelta value."
@@ -104,14 +104,14 @@ msgid ""
 "ceilometer-api started with aodh enabled. Alarms URLs will be redirected to "
 "aodh endpoint."
 msgstr ""
-"aodh가 사용된 상태로 ceilometer-api가 시작되었습니다. 알람 URL이 aodh 엔드포"
+"Aodh가 사용된 상태로 ceilometer-api가 시작되었습니다. 알람 URL이 aodh 엔드포"
 "인트로 경로가 재지정됩니다."
 
 msgid ""
 "ceilometer-api started with gnocchi enabled. The resources/meters/samples "
 "URLs are disabled."
 msgstr ""
-"gnocchi를 사용한 상태로 ceilometer-api가 시작되었습니다. 자원/미터/샘플 URL"
+"Gnocchi를 사용한 상태로 ceilometer-api가 시작되었습니다. 자원/측정/샘플 URL"
 "을 사용하지 않습니다."
 
 #, python-format
diff --git a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po
index 1d367cae..e14d85cc 100644
--- a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po
@@ -8,20 +8,17 @@
 # Seunghyo Chun <seunghyo.chun@gmail.com>, 2013
 # Sungjin Kang <potopro@gmail.com>, 2013
 # Sungjin Kang <potopro@gmail.com>, 2013
-# Lucas Palm <lapalm@us.ibm.com>, 2015. #zanata
-# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
-# Lucas Palm <lapalm@us.ibm.com>, 2016. #zanata
-# SeYeon Lee <sy_lee@kr.ibm.com>, 2016. #zanata
+# Sungjin Kang <gang.sungjin@gmail.com>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0rc3.dev2\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-30 00:07+0000\n"
+"POT-Creation-Date: 2016-04-07 10:58+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-29 04:06+0000\n"
-"Last-Translator: SeYeon Lee <sy_lee@kr.ibm.com>\n"
+"PO-Revision-Date: 2016-04-07 03:48+0000\n"
+"Last-Translator: Lucas Palm <lapalm@us.ibm.com>\n"
 "Language: ko-KR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.0\n"
@@ -66,7 +63,7 @@ msgstr "VM %s CPU 이용률을 가져올 수 없음"
 
 #, python-format
 msgid "Couldn't obtain IP address of instance %s"
-msgstr "%s 인스턴스의 IP 주소를 얻을 수 없음"
+msgstr "%s 인스턴스 IP 주소를 얻을 수 없음"
 
 msgid ""
 "Dispatcher target was not set, no meter will be posted. Set the target in "
@@ -92,7 +89,7 @@ msgid "Error parsing HTTP response: %s"
 msgstr "HTTP 응답 구문 분석 중 오류 발생: %s"
 
 msgid "Error stopping pollster."
-msgstr "의견조사자를 중지하는 중에 오류가 발생했습니다. "
+msgstr "pollster를 중지하는 중에 오류가 발생했습니다. "
 
 msgid "Event"
 msgstr "이벤트"
@@ -109,15 +106,15 @@ msgid ""
 "Failed to inspect data of instance <name=%(name)s, id=%(id)s>, domain state "
 "is SHUTOFF."
 msgstr ""
-"인스턴스 <이름=%(name)s, id=%(id)s>의 데이터 검사 실패, 도메인 상태가 SHUTOFF"
-"입니다."
+"인스턴스 <name=%(name)s, id=%(id)s> 데이터 검사 실패, 도메인 상태가 SHUTOFF입"
+"니다."
 
 #, python-format
 msgid ""
 "Failed to inspect memory usage of %(instance_uuid)s, can not get info from "
 "libvirt: %(error)s"
 msgstr ""
-"%(instance_uuid)s의 메모리 사용량 검사 실패, libvirt에서 정보를 가져올 수 없"
+"%(instance_uuid)s 메모리 사용량 검사 실패, libvirt에서 정보를 가져올 수 없"
 "음: %(error)s"
 
 #, python-format
@@ -125,16 +122,16 @@ msgid ""
 "Failed to inspect memory usage of instance <name=%(name)s, id=%(id)s>, can "
 "not get info from libvirt."
 msgstr ""
-"인스턴스 <이름=%(name)s, id=%(id)s>의 메모리 사용량 검사 실패, libvirt에서 정"
-"보를 가져올 수 없습니다."
+"인스턴스 <name=%(name)s, id=%(id)s> 메모리 사용량 검사 실패, libvirt에서 정보"
+"를 가져올 수 없습니다."
 
 #, python-format
 msgid "Failed to load any notification handlers for %s"
-msgstr "%s의 알림 핸들러 로드 실패"
+msgstr "%s 알림 핸들러 로드 실패"
 
 #, python-format
 msgid "Failed to parse the timestamp value %s"
-msgstr "시간소인 값 %s 구문 분석 실패"
+msgstr "Timestamp 값 %s 구문 분석 실패"
 
 #, python-format
 msgid "Failed to publish %d datapoints, dropping them"
@@ -196,7 +193,7 @@ msgid "Multiple VM %s found in XenServer"
 msgstr "여러 VM %s을(를) XenServer에서 찾음 "
 
 msgid "Must specify connection_url, and connection_password to use"
-msgstr "사용할 connection_url 및 connection_password를 지정해야 함 "
+msgstr "사용할 connection_url와 connection_password를 지정해야 함 "
 
 #, python-format
 msgid "No plugin named %(plugin)s available for %(name)s"
@@ -235,7 +232,7 @@ msgstr ""
 
 #, python-format
 msgid "Order-by expression not valid: %s"
-msgstr "Order-by 표현식이 올바르지 않음: %s"
+msgstr "정렬 표현식이 올바르지 않음: %s"
 
 #, python-format
 msgid ""
@@ -248,21 +245,23 @@ msgstr "기간은 양수여야 합니다. "
 
 #, python-format
 msgid "Pipeline %(pipeline)s: %(status)s after error from publisher %(pub)s"
-msgstr "파이프라인 %(pipeline)s: 공개자 %(pub)s에서 오류 후 %(status)s"
+msgstr "파이프라인 %(pipeline)s: Publisher %(pub)s에서 오류 후 %(status)s"
 
 #, python-format
 msgid "Pipeline %(pipeline)s: Continue after error from publisher %(pub)s"
-msgstr "파이프라인 %(pipeline)s: 공개자 %(pub)s에서 오류 후 계속"
+msgstr "파이프라인 %(pipeline)s: Publisher %(pub)s에서 오류 후 계속"
 
 #, python-format
 msgid "Pipeline %(pipeline)s: Error flushing transformer %(trans)s"
-msgstr "파이프라인 %(pipeline)s: 변환기 %(trans)s을(를) 비우는 중 오류 발생"
+msgstr ""
+"파이프라인 %(pipeline)s: Transformer %(trans)s을(를) 비우는 중 오류 발생"
 
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
 "%(smp)s"
-msgstr "파이프라인 %(pipeline)s: %(smp)s의 변환기 %(trans)s에서 오류 후 종료"
+msgstr ""
+"파이프라인 %(pipeline)s: %(smp)s의 transformer %(trans)s에서 오류 후 종료"
 
 #, python-format
 msgid "Plugin specified, but no plugin name supplied for %s"
@@ -278,12 +277,12 @@ msgstr "폴링 %(name)s이(가) %(cnt)s번 실패했습니다!"
 
 #, python-format
 msgid "Pollster for %s is disabled!"
-msgstr "%s의 의견조사자가 사용 안함으로 설정되어 있습니다!"
+msgstr "%s pollster가 사용 안함으로 설정되어 있습니다!"
 
 #, python-format
 msgid "Prevent pollster %(name)s for polling source %(source)s anymore!"
 msgstr ""
-"의견조사자 %(name)s이(가) 소스 %(source)s를 더 이상 폴링하지 않도록 하십시오!"
+"Pollster %(name)s이(가) 소스 %(source)s를 더 이상 폴링하지 않도록 하십시오!"
 
 #, python-format
 msgid ""
@@ -325,7 +324,7 @@ msgstr "문자열 %s이(가) 올바른 등시간이 아님"
 msgid ""
 "The Yaml file that defines mapping between samples and gnocchi resources/"
 "metrics"
-msgstr "샘플과 gnocchi resources/ 메트릭 간 맵핑을 정의하는 Yaml 파일"
+msgstr "샘플과 gnocchi resources/ metric 간 맵핑을 정의하는 Yaml 파일"
 
 #, python-format
 msgid ""
@@ -368,7 +367,7 @@ msgstr "%(expr)s 표현식을 평가할 수 없음: %(exc)s"
 
 #, python-format
 msgid "Unable to load publisher %s"
-msgstr "공개자 %s을(를) 로드할 수 없음"
+msgstr "Publisher %s을(를) 로드할 수 없음"
 
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
@@ -379,15 +378,15 @@ msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
 "up."
 msgstr ""
-"%(retries)d회 재시도한 이후에는 1차 mongodb에 다시 연결할 수 없습니다. 포기하"
-"는 중입니다."
+"%(retries)d 회 재시도한 이후에는 1차 mongodb에 다시 연결할 수 없습니다. 포기"
+"하는 중입니다."
 
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb: %(errmsg)s. Trying again in "
 "%(retry_interval)d seconds."
 msgstr ""
-"1차 mongodb에 다시 연결할 수 없음: %(errmsg)s. %(retry_interval)d초 후에 다"
+"1차 mongodb에 다시 연결할 수 없음: %(errmsg)s. %(retry_interval)d 초 후에 다"
 "시 시도합니다."
 
 msgid "Unable to send sample over UDP"
@@ -436,11 +435,11 @@ msgstr ""
 #, python-format
 msgid "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 msgstr ""
-"vip %(id)s에서 알 수 없는 상태 %(stat)s이(가) 수신됨. 샘플을 건너뛰는 중"
+"vIP %(id)s에서 알 수 없는 상태 %(stat)s이(가) 수신됨. 샘플을 건너뛰는 중"
 
 #, python-format
 msgid "Unknown status %(stat)s received on vpn %(id)s, skipping sample"
-msgstr "vpn%(id)s에서 알 수 없는 상태 %(stat)s이(가) 수신됨. 샘플 건너뛰기"
+msgstr "VPN %(id)s에서 알 수 없는 상태 %(stat)s이(가) 수신됨. 샘플 건너뛰기"
 
 #, python-format
 msgid "VM %s not found in VMware vSphere"
@@ -481,7 +480,7 @@ msgid "dropping sample with no predecessor: %s"
 msgstr "선행 작업이 없는 샘플 삭제: %s"
 
 msgid "ipmitool output length mismatch"
-msgstr "ipmitool 출력 길이 불일치"
+msgstr "Ipmitool 출력 길이 불일치"
 
 msgid "max_bytes and backup_count should be numbers."
 msgstr "max_bytes 및 backup_count는 숫자여야 합니다."
@@ -498,4 +497,4 @@ msgid "parse IPMI sensor data failed,unknown sensor type"
 msgstr "IPMI 센서 데이터 구문 분석에 실패했음, 알 수 없는 센서 유형"
 
 msgid "running ipmitool failure"
-msgstr "ipmitool 실행 실패"
+msgstr "Ipmitool 실행 실패"
diff --git a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
index d975eed5..81b05ba5 100644
--- a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
@@ -12,20 +12,18 @@
 # Yu Zhang, 2013
 # 颜海峰 <yanheven@gmail.com>, 2014
 # English translations for ceilometer.
-# Lucas Palm <lapalm@us.ibm.com>, 2015. #zanata
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
-# Alex Eng <loones1595@gmail.com>, 2016. #zanata
 # Daisy <guoyingc@cn.ibm.com>, 2016. #zanata
 # Linda <duleish@cn.ibm.com>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0rc4.dev1\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-30 10:37+0000\n"
+"POT-Creation-Date: 2016-04-07 10:58+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-31 03:32+0000\n"
+"PO-Revision-Date: 2016-04-19 05:12+0000\n"
 "Last-Translator: Linda <duleish@cn.ibm.com>\n"
 "Language: zh-CN\n"
 "Language-Team: Chinese (China)\n"
@@ -35,7 +33,7 @@ msgstr ""
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
-msgstr "无法找到%(entity)s %(id)s "
+msgstr "无法找到 %(entity)s %(id)s "
 
 #, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
@@ -47,7 +45,7 @@ msgstr "表%(table_name)s已经存在，无法创建。忽略此错误继续执�
 
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
-msgstr "遇到错误%(name)s：%(error)s，继续执行"
+msgstr "%(name)s 出错：%(error)s，继续执行"
 
 #, python-format
 msgid "Could not connect slave host: %s "
@@ -87,12 +85,12 @@ msgid ""
 "Error from libvirt while looking up instance <name=%(name)s, id=%(id)s>: "
 "[Error Code %(error_code)s] %(ex)s"
 msgstr ""
-"查找实例 <名称为 %(name)s，标识为 %(id)s> 时，libvirt 中出错：[错误代码 "
+"查找实例 <name=%(name)s, id=%(id)s> 时，libvirt 中出错：[错误代码 "
 "%(error_code)s] %(ex)s"
 
 #, python-format
 msgid "Error parsing HTTP response: %s"
-msgstr "解析HTTP响应失败: %s"
+msgstr "解析 HTTP 响应失败：%s"
 
 msgid "Error stopping pollster."
 msgstr "停止轮询程序时出错。"
@@ -105,7 +103,7 @@ msgstr "表达式计算结果为NaN！"
 
 #, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
-msgstr "无法为%(name)s引入扩展：%(error)s"
+msgstr "未能导入 %(name)s 的扩展：%(error)s"
 
 #, python-format
 msgid ""
@@ -132,7 +130,7 @@ msgstr ""
 
 #, python-format
 msgid "Failed to load any notification handlers for %s"
-msgstr "无法为%s加载任何通知处理器"
+msgstr "无法为 %s 加载任何通知处理器"
 
 #, python-format
 msgid "Failed to parse the timestamp value %s"
@@ -174,7 +172,8 @@ msgstr "正在忽略池 %(pool_id)s"
 msgid ""
 "Invalid YAML syntax in Definitions file %(file)s at line: %(line)s, column: "
 "%(column)s."
-msgstr "定义文件%(file)s中有非法YAML语法，行：%(line)s，列%(column)s。"
+msgstr ""
+"定义文件 %(file)s 的第 %(line)s 行和第 %(column)s 列中有无效 YAML 语法。"
 
 #, python-format
 msgid "Invalid period %(period)s: %(err)s"
@@ -200,14 +199,14 @@ msgstr "使用时必须指定connection_url和connection_password"
 
 #, python-format
 msgid "No plugin named %(plugin)s available for %(name)s"
-msgstr "未对 %(name)s 提供名为  %(plugin)s 的插件"
+msgstr "未对 %(name)s 提供名为 %(plugin)s 的插件"
 
 msgid "Node Manager init failed"
 msgstr "节点管理器初始化失败"
 
 #, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
-msgstr "权限不足以访问%(aspect)s %(id)s"
+msgstr "未授权访问 %(aspect)s %(id)s"
 
 #, python-format
 msgid "OpenDaylitght API returned %(status)s %(reason)s"
@@ -236,7 +235,7 @@ msgstr "orderby表达式不合法：%s"
 #, python-format
 msgid ""
 "Parse error in JSONPath specification '%(jsonpath)s' for %(name)s: %(err)s"
-msgstr "对 %(name)s 指定的 JSONPath（即“%(jsonpath)s”）存在解析错误：%(err)s"
+msgstr "%(name)s 的 JSONPath 规范“%(jsonpath)s”中存在解析错误：%(err)s"
 
 msgid "Period must be positive."
 msgstr "period 参数必须是正数"
@@ -244,21 +243,21 @@ msgstr "period 参数必须是正数"
 #, python-format
 msgid "Pipeline %(pipeline)s: %(status)s after error from publisher %(pub)s"
 msgstr ""
-"管道 %(pipeline)s：在发布程序 %(pub)s 中发生错误之后，处于 %(status)s 状态"
+"管道 %(pipeline)s：发布程序 %(pub)s 中发生错误之后，处于 %(status)s 状态"
 
 #, python-format
 msgid "Pipeline %(pipeline)s: Continue after error from publisher %(pub)s"
-msgstr "流水线%(pipeline)s：发布器%(pub)s报错，继续执行"
+msgstr "管道 %(pipeline)s：发布器 %(pub)s 出错，继续执行"
 
 #, python-format
 msgid "Pipeline %(pipeline)s: Error flushing transformer %(trans)s"
-msgstr "流水线%(pipeline)s：变形器%(trans)s清空数据时出错"
+msgstr "管道 %(pipeline)s：清空变形器 %(trans)s 时出错"
 
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
 "%(smp)s"
-msgstr "流水线%(pipeline)s：数据%(smp)s的变形器%(trans)s遇到错误，退出"
+msgstr "管道 %(pipeline)s：%(smp)s 的变形器%(trans)s 出错，退出"
 
 #, python-format
 msgid "Plugin specified, but no plugin name supplied for %s"
@@ -311,7 +310,7 @@ msgstr "样本应包括在请求主体中"
 
 #, python-format
 msgid "Skip loading extension for %s"
-msgstr "跳过为%s加载扩展"
+msgstr "跳过 %s 的加载扩展"
 
 #, python-format
 msgid "String %s is not a valid isotime"
@@ -326,7 +325,7 @@ msgstr "用于定义样本与 gnocchi 资源/度量值之间的映射的Yaml 文
 msgid ""
 "The data type %(type)s is not supported. The supported data type list is: "
 "%(supported)s"
-msgstr "数据类型%(type)s不被支持。支持的数据类型列表：%(supported)s"
+msgstr "数据类型 %(type)s 不受支持。受支持的数据类型列表是：%(supported)s"
 
 #, python-format
 msgid "The field 'fields' is required for %s"
@@ -337,10 +336,10 @@ msgstr "文件发布器必须设置文件路径"
 
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
-msgstr "UDP: 无法解码由 %s 发送的数据"
+msgstr "UDP：无法解码由 %s 发送的数据"
 
 msgid "UDP: Unable to store meter"
-msgstr "UDP: 无法存储计量器"
+msgstr "UDP：无法存储计量器"
 
 #, python-format
 msgid "Unable to connect to the database server: %(errmsg)s."
@@ -349,7 +348,7 @@ msgstr "无法连接到数据库服务器：%(errmsg)s。"
 #, python-format
 msgid ""
 "Unable to convert the value %(value)s to the expected data type %(type)s."
-msgstr "无法转换%(value)s到预期的数据类型%(type)s。"
+msgstr "无法将值 %(value)s 转换为预期的数据类型 %(type)s。"
 
 #, python-format
 msgid "Unable to discover resources: %s"
@@ -361,7 +360,7 @@ msgstr "无法计算表达式%(expr)s：%(exc)s"
 
 #, python-format
 msgid "Unable to load publisher %s"
-msgstr "无法加载发布器%s"
+msgstr "无法加载发布器 %s"
 
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
@@ -386,11 +385,11 @@ msgstr "无法通过UDP发送采样"
 #, python-format
 msgid ""
 "Unexpected exception converting %(value)s to the expected data type %(type)s."
-msgstr "在转换%(value)s到预期的数据类型%(type)s时发生了未预料的异常。"
+msgstr "将 %(value)s 转换为预期的数据类型 %(type)s 时发生了意外的异常。"
 
 #, python-format
 msgid "Unknown discovery extension: %s"
-msgstr "未知的发现器插件：%s"
+msgstr "未知的发现扩展：%s"
 
 #, python-format
 msgid "Unknown metadata type. Key (%s) will not be queryable."
@@ -441,7 +440,7 @@ msgstr "XenAPI没有安装"
 
 #, python-format
 msgid "YAML error reading Definitions file %(file)s"
-msgstr "读取定义文件%(file)s时遇到YAML错误"
+msgstr "读取定义文件 %(file)s 时遇到 YAML 错误"
 
 msgid "alarms URLs is unavailable when Aodh is disabled or unavailable."
 msgstr "Aodh 被禁用或不可用时，警报 URL 不可用。"
diff --git a/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po b/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po
index 714b3938..25ca23b9 100644
--- a/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po
@@ -4,19 +4,16 @@
 #
 # Translators:
 # Stefano Maffulli <smaffulli@gmail.com>, 2013
-# Lucas Palm <lapalm@us.ibm.com>, 2015. #zanata
-# OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 # Jennifer <cristxu@tw.ibm.com>, 2016. #zanata
-# Lucas Palm <lapalm@us.ibm.com>, 2016. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.0rc4.dev1\n"
+"Project-Id-Version: ceilometer 6.0.1.dev3\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-03-30 10:37+0000\n"
+"POT-Creation-Date: 2016-04-07 10:58+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-03-31 03:41+0000\n"
+"PO-Revision-Date: 2016-04-15 07:53+0000\n"
 "Last-Translator: Jennifer <cristxu@tw.ibm.com>\n"
 "Language: zh-TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -67,7 +64,7 @@ msgstr "無法取得實例 %s 的 IP 位址"
 msgid ""
 "Dispatcher target was not set, no meter will be posted. Set the target in "
 "the ceilometer.conf file"
-msgstr "未設定分派器目標，將不公佈任何計量。請在ceilometer.conf 檔中設定目標。"
+msgstr "未設定分派器目標，將不公佈任何計量。請在ceilometer.conf 檔中設定目標"
 
 #, python-format
 msgid "Dropping Notification %(type)s (uuid:%(msgid)s)"
@@ -92,7 +89,7 @@ msgid "Event"
 msgstr "事件"
 
 msgid "Expression evaluated to a NaN value!"
-msgstr "表示式已求值為非數字值！"
+msgstr "表示式求值結果為非數字值！"
 
 #, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
@@ -109,14 +106,14 @@ msgid ""
 "Failed to inspect memory usage of %(instance_uuid)s, can not get info from "
 "libvirt: %(error)s"
 msgstr ""
-"無法檢查 %(instance_uuid)s 的記憶體用量，無法從 libVirt 取得資訊：%(error)s"
+"無法檢查 %(instance_uuid)s 的記憶體用量，無法從 libvirt 取得資訊：%(error)s"
 
 #, python-format
 msgid ""
 "Failed to inspect memory usage of instance <name=%(name)s, id=%(id)s>, can "
 "not get info from libvirt."
 msgstr ""
-"無法檢查實例 <名稱=%(name)s，ID=%(id)s> 的記憶體用量，無法從 libVirt 取得資"
+"無法檢查實例 <名稱=%(name)s，ID=%(id)s> 的記憶體用量，無法從 libvirt 取得資"
 "訊。"
 
 #, python-format
@@ -163,22 +160,22 @@ msgstr "正在忽略儲存區 %(pool_id)s"
 msgid ""
 "Invalid YAML syntax in Definitions file %(file)s at line: %(line)s, column: "
 "%(column)s."
-msgstr "定義檔 %(file)s 第 %(line)s 行第 %(column)s 列中的 YAML 語法無效。"
+msgstr "定義檔 %(file)s 第 %(line)s 行第 %(column)s 直欄中的 YAML 語法無效。"
 
 #, python-format
 msgid "Invalid period %(period)s: %(err)s"
-msgstr "期間 %(period)s 無效：%(err)s"
+msgstr "時間段 %(period)s 無效：%(err)s"
 
 #, python-format
 msgid "Invalid trait type '%(type)s' for trait %(trait)s"
-msgstr "特徵 %(trait)s 的特徵類型 '%(type)s' 無效"
+msgstr "特質 %(trait)s 的特質類型 '%(type)s' 無效"
 
 msgid "Limit must be positive"
 msgstr "限制值必須是正數"
 
 #, python-format
 msgid "More than one event with id %s returned from storage driver"
-msgstr "從儲存體驅動程式傳回了多個 ID 為 %s 的事件"
+msgstr "從儲存體驅動程式傳回了多於一個 ID 為 %s 的事件"
 
 #, python-format
 msgid "Multiple VM %s found in XenServer"
@@ -228,7 +225,7 @@ msgid ""
 msgstr "%(name)s 的 JSONPath 規格 '%(jsonpath)s' 中發生剖析錯誤：%(err)s"
 
 msgid "Period must be positive."
-msgstr "期間必須是正數。"
+msgstr "時間段必須是正數。"
 
 #, python-format
 msgid "Pipeline %(pipeline)s: %(status)s after error from publisher %(pub)s"
@@ -246,7 +243,7 @@ msgstr "管線 %(pipeline)s：清除轉換器 %(trans)s 時發生錯誤"
 msgid ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
 "%(smp)s"
-msgstr "管線 %(pipeline)s：%(smp)s 的轉換器 %(trans)s傳回錯誤後結束"
+msgstr "管線 %(pipeline)s：%(smp)s 的轉換器 %(trans)s 傳回錯誤後結束"
 
 #, python-format
 msgid "Plugin specified, but no plugin name supplied for %s"
@@ -258,7 +255,7 @@ msgstr "輪詢 %(mtr)s 感應器已失敗 %(cnt)s 次！"
 
 #, python-format
 msgid "Polling %(name)s failed for %(cnt)s times!"
-msgstr "輪詢 %(name)s 失敗了 %(cnt)s 次！"
+msgstr "輪詢 %(name)s 已失敗 %(cnt)s 次！"
 
 #, python-format
 msgid "Pollster for %s is disabled!"
@@ -308,7 +305,7 @@ msgstr "字串 %s 不是有效的 ISO 時間"
 msgid ""
 "The Yaml file that defines mapping between samples and gnocchi resources/"
 "metrics"
-msgstr "用來在範例與 gnocchi 資源/度量之間定義對映的Yaml 檔案"
+msgstr "用來定義範例與 gnocchi 資源/度量之間之對映的Yaml 檔案"
 
 #, python-format
 msgid ""