diff --git a/ceilometer/locale/ceilometer-log-critical.pot b/ceilometer/locale/ceilometer-log-critical.pot
index aa71dd22..21ebe07d 100644
--- a/ceilometer/locale/ceilometer-log-critical.pot
+++ b/ceilometer/locale/ceilometer-log-critical.pot
@@ -1,19 +1,19 @@
 # Translations template for ceilometer.
-# Copyright (C) 2014 ORGANIZATION
+# Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2014.2.dev50.ga2139d8\n"
+"Project-Id-Version: ceilometer 5.0.0.0b2.dev138\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-06-19 06:01+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 
diff --git a/ceilometer/locale/ceilometer-log-error.pot b/ceilometer/locale/ceilometer-log-error.pot
index d6be33e4..08b102ed 100644
--- a/ceilometer/locale/ceilometer-log-error.pot
+++ b/ceilometer/locale/ceilometer-log-error.pot
@@ -6,16 +6,16 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 5.0.0.0b2.dev94\n"
+"Project-Id-Version: ceilometer 5.0.0.0b2.dev138\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-20 06:09+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 
 #: ceilometer/collector.py:168
 #, python-format
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
-#: ceilometer/service_base.py:65
+#: ceilometer/service_base.py:70
 #, python-format
 msgid "Unable to load changed pipeline: %s"
 msgstr ""
@@ -64,6 +64,21 @@ msgstr ""
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
+#: ceilometer/dispatcher/gnocchi.py:174 ceilometer/meter/notifications.py:79
+#, python-format
+msgid "Parse error in JSONPath specification '%(jsonpath)s': %(err)s"
+msgstr ""
+
+#: ceilometer/dispatcher/gnocchi.py:186 ceilometer/meter/notifications.py:61
+#, python-format
+msgid "Required field %s not specified"
+msgstr ""
+
+#: ceilometer/dispatcher/gnocchi.py:189
+#, python-format
+msgid "Required field %(field)s should be a %(type)s"
+msgstr ""
+
 #: ceilometer/dispatcher/http.py:136
 msgid "Status Code: %{code}s. Failed to dispatch event: %{event}s"
 msgstr ""
@@ -77,16 +92,6 @@ msgstr ""
 msgid "Failed to record event: %s"
 msgstr ""
 
-#: ceilometer/meter/notifications.py:61
-#, python-format
-msgid "Required field %s not specified"
-msgstr ""
-
-#: ceilometer/meter/notifications.py:79
-#, python-format
-msgid "Parse error in JSONPath specification '%(jsonpath)s': %(err)s"
-msgstr ""
-
 #: ceilometer/meter/notifications.py:90
 #, python-format
 msgid "Invalid type %s specified"
diff --git a/ceilometer/locale/ceilometer-log-info.pot b/ceilometer/locale/ceilometer-log-info.pot
index 16ca9f75..3871a90e 100644
--- a/ceilometer/locale/ceilometer-log-info.pot
+++ b/ceilometer/locale/ceilometer-log-info.pot
@@ -6,16 +6,16 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 5.0.0.0b2.dev94\n"
+"Project-Id-Version: ceilometer 5.0.0.0b2.dev138\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-20 06:09+0000\n"
+"POT-Creation-Date: 2015-07-29 06:34+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 
 #: ceilometer/coordination.py:76
 msgid "Coordination backend started successfully."
@@ -43,7 +43,7 @@ msgstr ""
 msgid "Detected change in pipeline configuration."
 msgstr ""
 
-#: ceilometer/agent/base.py:378
+#: ceilometer/agent/base.py:394
 msgid "Reconfiguring polling tasks."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:411
+#: ceilometer/event/storage/impl_sqlalchemy.py:415
 #, python-format
 msgid "%d events are removed from database"
 msgstr ""
diff --git a/ceilometer/locale/ceilometer-log-warning.pot b/ceilometer/locale/ceilometer-log-warning.pot
index eefc6f36..46beaf52 100644
--- a/ceilometer/locale/ceilometer-log-warning.pot
+++ b/ceilometer/locale/ceilometer-log-warning.pot
@@ -6,18 +6,18 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 5.0.0.0b2.dev56\n"
+"Project-Id-Version: ceilometer 5.0.0.0b2.dev138\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-10 06:11+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 
-#: ceilometer/notification.py:157
+#: ceilometer/notification.py:173
 msgid ""
 "Non-metric meters may be collected. It is highly advisable to disable "
 "these meters using ceilometer.conf or the pipeline.yaml"
@@ -39,6 +39,26 @@ msgid ""
 "with False"
 msgstr ""
 
+#: ceilometer/api/controllers/v2/root.py:122
+msgid "Can't connect to keystone, assuming gnocchi is disabled and retry later"
+msgstr ""
+
+#: ceilometer/api/controllers/v2/root.py:126
+msgid ""
+"ceilometer-api started with gnocchi enabled. The resources/meters/samples"
+" URLs are disabled."
+msgstr ""
+
+#: ceilometer/api/controllers/v2/root.py:147
+msgid "Can't connect to keystone, assuming aodh is disabled and retry later."
+msgstr ""
+
+#: ceilometer/api/controllers/v2/root.py:150
+msgid ""
+"ceilometer-api started with aodh enabled. Alarms URLs will be redirected "
+"to aodh endpoint."
+msgstr ""
+
 #: ceilometer/cmd/eventlet/polling.py:51
 #, python-format
 msgid "Duplicated values: %s found in CLI options, auto de-duplidated"
diff --git a/ceilometer/locale/ceilometer.pot b/ceilometer/locale/ceilometer.pot
index 1426b1a0..b7af48c8 100644
--- a/ceilometer/locale/ceilometer.pot
+++ b/ceilometer/locale/ceilometer.pot
@@ -6,16 +6,16 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 5.0.0.0b2.dev116\n"
+"Project-Id-Version: ceilometer 5.0.0.0b2.dev138\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-24 06:28+0000\n"
+"POT-Creation-Date: 2015-07-29 06:34+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 
 #: ceilometer/collector.py:125
 #, python-format
@@ -136,37 +136,37 @@ msgstr ""
 msgid "Skip polling pollster %s, no resources found"
 msgstr ""
 
-#: ceilometer/agent/base.py:188
+#: ceilometer/agent/base.py:186
 #, python-format
 msgid "Prevent pollster %(name)s for polling source %(source)s anymore!"
 msgstr ""
 
-#: ceilometer/agent/base.py:194
+#: ceilometer/agent/base.py:192
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/agent/base.py:253
+#: ceilometer/agent/base.py:251
 #, python-format
 msgid "Skip loading extension for %s"
 msgstr ""
 
-#: ceilometer/agent/base.py:257
+#: ceilometer/agent/base.py:255
 #, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/agent/base.py:381
+#: ceilometer/agent/base.py:379
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr ""
 
-#: ceilometer/agent/base.py:383
+#: ceilometer/agent/base.py:381
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr ""
 
-#: ceilometer/agent/base.py:392
+#: ceilometer/agent/base.py:390
 msgid "Error stopping pollster."
 msgstr ""
 
@@ -860,43 +860,49 @@ msgid ""
 "%(counter_volume)s"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:56
+#: ceilometer/dispatcher/gnocchi.py:57
 msgid "The Yaml file that defines per metric archive policies."
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:141
+#: ceilometer/dispatcher/gnocchi.py:61
+msgid ""
+"The Yaml file that defines mapping between samples and gnocchi "
+"resources/metrics"
+msgstr ""
+
+#: ceilometer/dispatcher/gnocchi.py:105
 msgid "No archive policy file found! Using default config."
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:311
+#: ceilometer/dispatcher/gnocchi.py:415
 #, python-format
 msgid ""
 "The metric %(metric_name)s of resource %(resource_id)s doesn't exists: "
 "%(status_code)d"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:320
+#: ceilometer/dispatcher/gnocchi.py:424
 #, python-format
 msgid ""
 "Fail to post measure on metric %(metric_name)s of resource "
 "%(resource_id)s with status: %(status_code)d: %(msg)s"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:343
+#: ceilometer/dispatcher/gnocchi.py:447
 #, python-format
 msgid ""
 "Resource %(resource_id)s creation failed with status: %(status_code)d: "
 "%(msg)s"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:361
+#: ceilometer/dispatcher/gnocchi.py:465
 #, python-format
 msgid ""
 "Resource %(resource_id)s update failed with status: %(status_code)d: "
 "%(msg)s"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:383
+#: ceilometer/dispatcher/gnocchi.py:488
 #, python-format
 msgid ""
 "Fail to create metric %(metric_name)s of resource %(resource_id)s with "
diff --git a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-error.po b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-error.po
index a375cb5c..66a4e5fa 100644
--- a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-error.po
+++ b/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-07-24 06:28+0000\n"
-"PO-Revision-Date: 2015-07-16 19:11+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+0000\n"
+"PO-Revision-Date: 2015-07-24 22:24+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"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Error connecting to coordination backend."
diff --git a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po
index 817eef34..15c098f4 100644
--- a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po
+++ b/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-07-24 06:28+0000\n"
-"PO-Revision-Date: 2015-06-23 16:41+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+0000\n"
+"PO-Revision-Date: 2015-07-24 13:32+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"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, python-format
diff --git a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
index d224ceaf..131e21f4 100644
--- a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
+++ b/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-07-24 06:28+0000\n"
-"PO-Revision-Date: 2015-07-22 19:43+0000\n"
+"POT-Creation-Date: 2015-07-29 06:34+0000\n"
+"PO-Revision-Date: 2015-07-24 22:24+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"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
diff --git a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po b/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po
index 2be4e044..2fbd1e33 100644
--- a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po
+++ b/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-24 06:28+0000\n"
+"POT-Creation-Date: 2015-07-29 06:34+0000\n"
 "PO-Revision-Date: 2015-07-13 14:33+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
@@ -19,7 +19,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, python-format
diff --git a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po b/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po
index b03629fd..a645b9d6 100644
--- a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po
+++ b/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-07-24 06:28+0000\n"
-"PO-Revision-Date: 2015-06-23 16:41+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+0000\n"
+"PO-Revision-Date: 2015-07-24 13:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
 "language/fr/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #, python-format
diff --git a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-error.po b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-error.po
index ae145946..99c7297b 100644
--- a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-error.po
+++ b/ceilometer/locale/zh_CN/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-07-24 06:28+0000\n"
-"PO-Revision-Date: 2015-07-16 19:11+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+0000\n"
+"PO-Revision-Date: 2015-07-24 22:24+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, python-format
diff --git a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-info.po b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-info.po
index e9924a5c..372b4ded 100644
--- a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-info.po
+++ b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-info.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-24 06:28+0000\n"
+"POT-Creation-Date: 2015-07-29 06:34+0000\n"
 "PO-Revision-Date: 2015-07-13 14:33+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, python-format
diff --git a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-warning.po b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-warning.po
index 8aaf09cc..c54bd7d4 100644
--- a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer-log-warning.po
+++ b/ceilometer/locale/zh_CN/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-07-24 06:28+0000\n"
-"PO-Revision-Date: 2015-06-23 16:41+0000\n"
+"POT-Creation-Date: 2015-07-29 06:35+0000\n"
+"PO-Revision-Date: 2015-07-24 13:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, python-format
diff --git a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
index bf7c0d97..f59dd299 100644
--- a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-24 06:28+0000\n"
-"PO-Revision-Date: 2015-07-22 19:43+0000\n"
+"POT-Creation-Date: 2015-07-29 06:34+0000\n"
+"PO-Revision-Date: 2015-07-24 22:24+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.0\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"