Imported Translations from Zanata

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

Change-Id: Id78c06e4183c501b8a21600f63bb0c90ee386c12

15 files changed, 310 insertions, 2841 deletions

diff --git a/ceilometer/locale/ceilometer-log-error.pot b/ceilometer/locale/ceilometer-log-error.pot
index e79e0cde..3db63c99 100644
--- a/ceilometer/locale/ceilometer-log-error.pot
+++ b/ceilometer/locale/ceilometer-log-error.pot
@@ -1,23 +1,23 @@
 # Translations template for ceilometer.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev48\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-10 06:16+0000\n"
+"POT-Creation-Date: 2016-01-25 06:09+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 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
 
-#: ceilometer/collector.py:178
+#: ceilometer/collector.py:176
 #, python-format
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
@@ -49,12 +49,16 @@ msgstr ""
 msgid "Unable to load changed event pipeline: %s"
 msgstr ""
 
-#: ceilometer/agent/manager.py:465
+#: ceilometer/agent/manager.py:468
 #, python-format
 msgid "Skipping %(name)s, keystone issue: %(exc)s"
 msgstr ""
 
-#: ceilometer/api/hooks.py:68
+#: ceilometer/agent/plugin_base.py:109
+msgid "Fail to process notification"
+msgstr ""
+
+#: ceilometer/api/hooks.py:65
 #, python-format
 msgid "Failed to connect to db, purpose %(purpose)s retry later: %(err)s"
 msgstr ""
@@ -64,43 +68,41 @@ msgstr ""
 msgid "Could not get Resident Memory Usage for %(id)s: %(e)s"
 msgstr ""
 
-#: ceilometer/dispatcher/database.py:51
+#: ceilometer/dispatcher/database.py:54
 #, python-format
 msgid "Failed to connect to db, purpose %(purpose)s re-try later: %(err)s"
 msgstr ""
 
-#: ceilometer/dispatcher/database.py:94
+#: ceilometer/dispatcher/database.py:97
 #, python-format
 msgid "Failed to record metering data: %s"
 msgstr ""
 
-#: ceilometer/dispatcher/database.py:123
+#: ceilometer/dispatcher/database.py:128
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:93
+#: ceilometer/dispatcher/gnocchi.py:107
 #, python-format
 msgid "Required field %s not specified"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:96
+#: ceilometer/dispatcher/gnocchi.py:110
 #, python-format
 msgid "Required field %(field)s should be a %(type)s"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:108 ceilometer/meter/notifications.py:101
-#, python-format
-msgid "Parse error in JSONPath specification '%(jsonpath)s': %(err)s"
+#: ceilometer/dispatcher/gnocchi.py:235
+msgid "Failed to connect to Gnocchi."
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi.py:285
-#, python-format
-msgid "Fail to post measures for %(resource_id)s/%(metric_name)s"
+#: ceilometer/dispatcher/http.py:126
+msgid "Status Code: %{code}s. Failed todispatch event: %{event}s"
 msgstr ""
 
-#: ceilometer/dispatcher/http.py:139
-msgid "Status Code: %{code}s. Failed to dispatch event: %{event}s"
+#: ceilometer/event/endpoint.py:69
+msgid "Fail to process a notification"
 msgstr ""
 
 #: ceilometer/event/storage/impl_elasticsearch.py:110
@@ -112,79 +114,57 @@ msgstr ""
 msgid "Failed to record event: %s"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:70
+#: ceilometer/hardware/pollsters/generic.py:69
 #, python-format
 msgid "Missing field %s"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:73
+#: ceilometer/hardware/pollsters/generic.py:72
 #, python-format
 msgid "Unrecognized type value %s"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:108
+#: ceilometer/hardware/pollsters/generic.py:107
 msgid "Passed resource dict must contain keys resource_id and resource_url."
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:127
+#: ceilometer/hardware/pollsters/generic.py:126
 #, python-format
 msgid "Cannot load inspector %(name)s: %(err)s"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:150
+#: ceilometer/hardware/pollsters/generic.py:149
 #, python-format
 msgid "Skip invalid resource %s"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:178
+#: ceilometer/hardware/pollsters/generic.py:177
 #, python-format
 msgid "inspector call failed for %(ident)s host %(host)s: %(err)s"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:241
-#: ceilometer/meter/notifications.py:160
-#, python-format
-msgid ""
-"Invalid YAML syntax in Meter Definitions file %(file)s at line: %(line)s,"
-" column: %(column)s."
-msgstr ""
-
-#: ceilometer/hardware/pollsters/generic.py:247
-#: ceilometer/meter/notifications.py:166
+#: ceilometer/hardware/pollsters/generic.py:227
+#: ceilometer/meter/notifications.py:192
 #, python-format
-msgid "YAML error reading Meter Definitions file %(file)s"
+msgid "Error loading meter definition : %(err)s"
 msgstr ""
 
-#: ceilometer/meter/notifications.py:69
+#: ceilometer/meter/notifications.py:65
 #, python-format
 msgid "Required fields %s not specified"
 msgstr ""
 
-#: ceilometer/meter/notifications.py:77
+#: ceilometer/meter/notifications.py:74
 #, python-format
 msgid "Invalid type %s specified"
 msgstr ""
 
-#: ceilometer/meter/notifications.py:150
-#, python-format
-msgid "Meter Definitions configuration file: %s"
-msgstr ""
-
-#: ceilometer/meter/notifications.py:173
-msgid "No Meter Definitions configuration file found! Using default config."
-msgstr ""
-
-#: ceilometer/meter/notifications.py:192
-#, python-format
-msgid "Error loading meter definition : %(err)s"
-msgstr ""
-
 #: ceilometer/publisher/kafka_broker.py:83
 #, python-format
 msgid "Failed to connect to Kafka service: %s"
 msgstr ""
 
-#: ceilometer/publisher/messaging.py:180
+#: ceilometer/publisher/messaging.py:168
 msgid "Failed to retry to send sample data with max_retry times"
 msgstr ""
 
diff --git a/ceilometer/locale/ceilometer-log-info.pot b/ceilometer/locale/ceilometer-log-info.pot
index 7ab9360e..ca08a139 100644
--- a/ceilometer/locale/ceilometer-log-info.pot
+++ b/ceilometer/locale/ceilometer-log-info.pot
@@ -1,21 +1,21 @@
 # Translations template for ceilometer.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev48\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-10 06:16+0000\n"
+"POT-Creation-Date: 2016-01-25 06:09+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 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
 
 #: ceilometer/coordination.py:74
 msgid "Coordination backend started successfully."
@@ -31,22 +31,27 @@ msgstr ""
 msgid "Left partitioning group %s"
 msgstr ""
 
-#: ceilometer/notification.py:289
+#: ceilometer/declarative.py:165
+#, python-format
+msgid "Definitions: %s"
+msgstr ""
+
+#: ceilometer/notification.py:301
 msgid "Reloading notification agent and listeners."
 msgstr ""
 
-#: ceilometer/pipeline.py:415
+#: ceilometer/pipeline.py:409
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Setup transformer instance %(name)s with parameter"
 " %(param)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:712 ceilometer/pipeline.py:774
+#: ceilometer/pipeline.py:705 ceilometer/pipeline.py:767
 msgid "detected decoupled pipeline config format"
 msgstr ""
 
-#: ceilometer/pipeline.py:798 ceilometer/pipeline.py:817
+#: ceilometer/pipeline.py:791 ceilometer/pipeline.py:810
 #, python-format
 msgid "Pipeline config: %s"
 msgstr ""
@@ -69,91 +74,42 @@ msgstr ""
 msgid "Polling pollster %(poll)s in the context of %(src)s"
 msgstr ""
 
-#: ceilometer/agent/manager.py:484
+#: ceilometer/agent/manager.py:487
 msgid "Reconfiguring polling tasks."
 msgstr ""
 
-#: ceilometer/alarm/service.py:94
-#, python-format
-msgid "initiating evaluation cycle on %d alarms"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/__init__.py:75
-#, python-format
-msgid "alarm %(id)s transitioning to %(state)s because %(reason)s"
-msgstr ""
-
-#: ceilometer/alarm/notifier/log.py:31
-#, python-format
-msgid ""
-"Notifying alarm %(alarm_name)s %(alarm_id)s of %(severity)s priority from"
-" %(previous)s to %(current)s with action %(action)s because %(reason)s."
-msgstr ""
-
-#: ceilometer/alarm/notifier/rest.py:68
-#, python-format
-msgid ""
-"Notifying alarm %(alarm_name)s %(alarm_id)s with severity %(severity)s "
-"from %(previous)s to %(current)s with action %(action)s because "
-"%(reason)s. request-id: %(request_id)s "
-msgstr ""
-
-#: ceilometer/alarm/storage/impl_log.py:60
-#, python-format
-msgid "Dropping alarm history data with TTL %d"
-msgstr ""
-
-#: ceilometer/alarm/storage/impl_sqlalchemy.py:342
-#, python-format
-msgid "%d alarm histories are removed from database"
-msgstr ""
-
-#: ceilometer/api/app.py:132
+#: ceilometer/api/app.py:109
 #, python-format
 msgid "Starting server in PID %s"
 msgstr ""
 
-#: ceilometer/api/app.py:133
+#: ceilometer/api/app.py:110
 msgid "Configuration:"
 msgstr ""
 
-#: ceilometer/api/app.py:137
+#: ceilometer/api/app.py:114
 #, python-format
 msgid "serving on 0.0.0.0:%(sport)s, view at http://127.0.0.1:%(vport)s"
 msgstr ""
 
-#: ceilometer/api/app.py:141
+#: ceilometer/api/app.py:118
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:329
-#, python-format
-msgid "duplicate actions are found: %s, remove duplicate ones"
-msgstr ""
-
 #: ceilometer/api/controllers/v2/utils.py:47
 #, python-format
 msgid "No limit value provided, result set will be limited to %(limit)d."
 msgstr ""
 
-#: ceilometer/cmd/eventlet/storage.py:45
+#: ceilometer/cmd/storage.py:44
 msgid "Nothing to clean, database metering time to live is disabled"
 msgstr ""
 
-#: ceilometer/cmd/eventlet/storage.py:54
+#: ceilometer/cmd/storage.py:53
 msgid "Nothing to clean, database event time to live is disabled"
 msgstr ""
 
-#: ceilometer/cmd/eventlet/storage.py:63
-msgid "Nothing to clean, database alarm history time to live is disabled"
-msgstr ""
-
-#: ceilometer/event/converter.py:407
-#, python-format
-msgid "Event Definitions: %s"
-msgstr ""
-
 #: ceilometer/event/storage/impl_elasticsearch.py:107
 #: ceilometer/event/storage/impl_sqlalchemy.py:201
 #: ceilometer/event/storage/pymongo_base.py:67
@@ -166,23 +122,17 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:440
+#: ceilometer/event/storage/impl_sqlalchemy.py:439
 #, python-format
 msgid "%d events are removed from database"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:253
-#: ceilometer/meter/notifications.py:177
-#, python-format
-msgid "Meter Definitions: %s"
-msgstr ""
-
-#: ceilometer/network/floatingip.py:54
+#: ceilometer/network/floatingip.py:55
 #, python-format
 msgid "FLOATING IP USAGE: %s"
 msgstr ""
 
-#: ceilometer/publisher/messaging.py:104
+#: ceilometer/publisher/messaging.py:93
 #, python-format
 msgid "Publishing policy set to %s"
 msgstr ""
@@ -197,21 +147,21 @@ msgstr ""
 msgid "Dropping metering data with TTL %d"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:364
+#: ceilometer/storage/impl_sqlalchemy.py:368
 #, python-format
 msgid "%d samples removed from database"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:400
+#: ceilometer/storage/impl_sqlalchemy.py:404
 msgid "Expired residual resource and meter definition data"
 msgstr ""
 
-#: ceilometer/storage/mongo/utils.py:264
+#: ceilometer/storage/mongo/utils.py:259
 #, python-format
 msgid "Connecting to %(db)s on %(nodelist)s"
 msgstr ""
 
-#: ceilometer/storage/mongo/utils.py:464
+#: ceilometer/storage/mongo/utils.py:462
 #, 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 a40efde2..10b0c2c3 100644
--- a/ceilometer/locale/ceilometer-log-warning.pot
+++ b/ceilometer/locale/ceilometer-log-warning.pot
@@ -1,36 +1,36 @@
 # Translations template for ceilometer.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-25 06:09+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 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
 
-#: ceilometer/notification.py:187
+#: ceilometer/notification.py:195
 msgid ""
 "Non-metric meters may be collected. It is highly advisable to disable "
 "these meters using ceilometer.conf or the pipeline.yaml"
 msgstr ""
 
-#: ceilometer/pipeline.py:579
+#: ceilometer/pipeline.py:582
 #, python-format
 msgid ""
 "metering data %(counter_name)s for %(resource_id)s @ %(timestamp)s has no"
 " volume (volume: None), the sample will be dropped"
 msgstr ""
 
-#: ceilometer/pipeline.py:592
+#: ceilometer/pipeline.py:595
 #, python-format
 msgid ""
 "metering data %(counter_name)s for %(resource_id)s @ %(timestamp)s has "
@@ -38,22 +38,17 @@ msgid ""
 "will be dropped"
 msgstr ""
 
-#: ceilometer/agent/manager.py:451
+#: ceilometer/agent/manager.py:453
 #, python-format
 msgid "Skipping %(name)s, %(service_type)s service is not registered in keystone"
 msgstr ""
 
-#: ceilometer/agent/discovery/endpoint.py:42
+#: ceilometer/agent/discovery/endpoint.py:44
 #, python-format
 msgid "No endpoints found for service %s"
 msgstr ""
 
-#: ceilometer/alarm/evaluator/threshold.py:106
-#, python-format
-msgid "Expecting %(expected)d datapoints but only get %(actual)d"
-msgstr ""
-
-#: ceilometer/api/app.py:80
+#: ceilometer/api/app.py:75
 msgid ""
 "pecan_debug cannot be enabled, if workers is > 1, the value is overrided "
 "with False"
@@ -69,23 +64,23 @@ msgid ""
 " URLs are disabled."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/root.py:148
+#: ceilometer/api/controllers/v2/root.py:149
 msgid "Can't connect to keystone, assuming aodh is disabled and retry later."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/root.py:151
+#: ceilometer/api/controllers/v2/root.py:152
 msgid ""
 "ceilometer-api started with aodh enabled. Alarms URLs will be redirected "
 "to aodh endpoint."
 msgstr ""
 
-#: ceilometer/cmd/eventlet/polling.py:51
+#: 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:711
+#: ceilometer/compute/pollsters/disk.py:163
+#: ceilometer/compute/pollsters/disk.py:633
 #: ceilometer/compute/pollsters/memory.py:51
 #: ceilometer/compute/pollsters/memory.py:94
 #: ceilometer/compute/pollsters/net.py:99
@@ -103,19 +98,34 @@ msgid ""
 "reason: %(exc)s"
 msgstr ""
 
-#: ceilometer/dispatcher/database.py:99
+#: ceilometer/dispatcher/__init__.py:68
+#, python-format
+msgid "Failed to load any dispatchers for %s"
+msgstr ""
+
+#: ceilometer/dispatcher/database.py:102
 #, python-format
 msgid "message signature invalid, discarding message: %r"
 msgstr ""
 
-#: ceilometer/event/trait_plugins.py:110
+#: ceilometer/dispatcher/database.py:131 ceilometer/dispatcher/http.py:130
+#, python-format
+msgid "event signature invalid, discarding event: %s"
+msgstr ""
+
+#: ceilometer/dispatcher/gnocchi.py:216
+#, python-format
+msgid "unable to configure oslo_cache: %s"
+msgstr ""
+
+#: ceilometer/event/trait_plugins.py:125
 #, python-format
 msgid ""
 "split plugin is deprecated, add \".`split(%(sep)s, %(segment)d, "
 "%(max_split)d)`\" to your jsonpath instead"
 msgstr ""
 
-#: ceilometer/hardware/pollsters/generic.py:66
+#: ceilometer/hardware/pollsters/generic.py:65
 #, python-format
 msgid "Ignore unrecognized field %s"
 msgstr ""
diff --git a/ceilometer/locale/ceilometer.pot b/ceilometer/locale/ceilometer.pot
index c0183e00..8039bb96 100644
--- a/ceilometer/locale/ceilometer.pot
+++ b/ceilometer/locale/ceilometer.pot
@@ -1,59 +1,91 @@
 # Translations template for ceilometer.
-# Copyright (C) 2015 ORGANIZATION
+# Copyright (C) 2016 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-25 06:09+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 2.1.1\n"
+"Generated-By: Babel 2.2.0\n"
 
-#: ceilometer/collector.py:135
+#: ceilometer/collector.py:134
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr ""
 
-#: ceilometer/collector.py:142
+#: ceilometer/collector.py:141
 msgid "UDP: Unable to store meter"
 msgstr ""
 
-#: ceilometer/notification.py:199
+#: ceilometer/declarative.py:43
+#, python-format
+msgid "The field 'fields' is required for %s"
+msgstr ""
+
+#: ceilometer/declarative.py:56
+#, python-format
+msgid "Plugin specified, but no plugin name supplied for %s"
+msgstr ""
+
+#: ceilometer/declarative.py:65
+#, python-format
+msgid "No plugin named %(plugin)s available for %(name)s"
+msgstr ""
+
+#: ceilometer/declarative.py:91
+#, python-format
+msgid "Parse error in JSONPath specification '%(jsonpath)s' for %(name)s: %(err)s"
+msgstr ""
+
+#: ceilometer/declarative.py:148
+#, python-format
+msgid ""
+"Invalid YAML syntax in Definitions file %(file)s at line: %(line)s, "
+"column: %(column)s."
+msgstr ""
+
+#: ceilometer/declarative.py:154
+#, python-format
+msgid "YAML error reading Definitions file %(file)s"
+msgstr ""
+
+#: ceilometer/notification.py:207
 #, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr ""
 
-#: ceilometer/pipeline.py:387
+#: ceilometer/pipeline.py:390
 #, python-format
 msgid "Unable to load publisher %s"
 msgstr ""
 
-#: ceilometer/pipeline.py:425
+#: ceilometer/pipeline.py:428
 #, python-format
 msgid "Pipeline %(pipeline)s: %(status)s after error from publisher %(pub)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:455
+#: ceilometer/pipeline.py:458
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
 "%(smp)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:492
+#: ceilometer/pipeline.py:495
 #, python-format
 msgid "Pipeline %(pipeline)s: Continue after error from publisher %(pub)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:508
+#: ceilometer/pipeline.py:511
 #, python-format
 msgid "Pipeline %(pipeline)s: Error flushing transformer %(trans)s"
 msgstr ""
@@ -78,189 +110,25 @@ msgstr ""
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/agent/manager.py:468
+#: ceilometer/agent/manager.py:471
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr ""
 
-#: ceilometer/agent/manager.py:470
+#: ceilometer/agent/manager.py:473
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr ""
 
-#: ceilometer/agent/manager.py:479
+#: ceilometer/agent/manager.py:482
 msgid "Error stopping pollster."
 msgstr ""
 
-#: ceilometer/alarm/service.py:99
-msgid "alarm evaluation cycle failed"
-msgstr ""
-
-#: ceilometer/alarm/service.py:111
-#, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr ""
-
-#: ceilometer/alarm/service.py:179
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr ""
-
-#: ceilometer/alarm/service.py:188
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-
-#: ceilometer/alarm/service.py:199
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr ""
-
-#: ceilometer/alarm/service.py:220
-msgid "Unable to notify for an alarm with no action"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/__init__.py:87
-msgid "alarm state update failed"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/combination.py:36
-msgid "alarm retrieval failed"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/combination.py:57
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/combination.py:79
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/combination.py:83
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/gnocchi.py:111
-#: ceilometer/alarm/evaluator/threshold.py:95
-msgid "alarm stats retrieval failed"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/gnocchi.py:114
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/gnocchi.py:141
-#: ceilometer/alarm/evaluator/threshold.py:112
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/gnocchi.py:164
-#: ceilometer/alarm/evaluator/threshold.py:137
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s "
-"threshold, most recent: %(most_recent)s"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/gnocchi.py:168
-#: ceilometer/alarm/evaluator/threshold.py:141
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s "
-"threshold, most recent: %(most_recent)s"
-msgstr ""
-
-#: ceilometer/alarm/storage/models.py:70
-msgid "timestamp should be datetime object"
-msgstr ""
-
-#: ceilometer/alarm/storage/models.py:72
-msgid "state_timestamp should be datetime object"
-msgstr ""
-
 #: ceilometer/api/middleware.py:102
 #, python-format
 msgid "Error parsing HTTP response: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:95
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:177
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:292
-msgid "Time constraint names must be unique for a given alarm."
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:302
-#, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:313
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:335
-#, python-format
-msgid "%(name)s count exceeds maximum value %(maximum)d"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:346
-#, python-format
-msgid "Unable to parse action %s"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:349
-#, python-format
-msgid "Unsupported action %s"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:352
-#, python-format
-msgid "You are not authorized to create action: %s"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:594
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:606
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:607
-#: ceilometer/api/controllers/v2/alarms.py:772
-msgid "Alarm incorrect"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:663
-msgid "state invalid"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:765
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:771
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr ""
-
 #: ceilometer/api/controllers/v2/base.py:50
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
@@ -290,16 +158,6 @@ msgid ""
 "%(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:240
-#, python-format
-msgid "Alarm %s not found"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/base.py:242
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr ""
-
 #: ceilometer/api/controllers/v2/events.py:190
 #, python-format
 msgid ""
@@ -307,11 +165,18 @@ msgid ""
 "%(supported)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/events.py:297
+#: ceilometer/api/controllers/v2/events.py:196
+#, python-format
+msgid ""
+"operator %(operator)s is not supported. Only equality operator is "
+"available for field %(field)s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2/events.py:303
 msgid "Event"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/events.py:300
+#: ceilometer/api/controllers/v2/events.py:306
 #, python-format
 msgid "More than one event with id %s returned from storage driver"
 msgstr ""
@@ -329,22 +194,22 @@ msgstr ""
 msgid "Invalid period %(period)s: %(err)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/query.py:205
+#: ceilometer/api/controllers/v2/query.py:203
 #, python-format
 msgid "Filter expression not valid: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/query.py:220
+#: ceilometer/api/controllers/v2/query.py:218
 #, python-format
 msgid "Order-by expression not valid: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/query.py:318
+#: ceilometer/api/controllers/v2/query.py:316
 #, python-format
 msgid "String %s is not a valid isotime"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/query.py:319
+#: ceilometer/api/controllers/v2/query.py:317
 #, python-format
 msgid "Failed to parse the timestamp value %s"
 msgstr ""
@@ -353,7 +218,7 @@ msgstr ""
 msgid "Resource"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/root.py:163
+#: ceilometer/api/controllers/v2/root.py:164
 msgid "direct option cannot be true when Gnocchi is enabled."
 msgstr ""
 
@@ -365,27 +230,6 @@ msgstr ""
 msgid "Limit must be positive"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarm_rules/combination.py:39
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarm_rules/combination.py:48
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarm_rules/combination.py:69
-#, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarm_rules/threshold.py:93
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-
 #: ceilometer/compute/pollsters/cpu.py:56
 #, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
@@ -396,16 +240,16 @@ msgstr ""
 msgid "Could not get CPU Util for %(id)s: %(e)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:144
-#: ceilometer/compute/pollsters/disk.py:354
-#: ceilometer/compute/pollsters/disk.py:540
-#: ceilometer/compute/pollsters/disk.py:622
+#: ceilometer/compute/pollsters/disk.py:174
+#: ceilometer/compute/pollsters/disk.py:312
+#: ceilometer/compute/pollsters/disk.py:447
+#: ceilometer/compute/pollsters/disk.py:517
 #: ceilometer/compute/pollsters/net.py:110
 #, python-format
 msgid "Ignoring instance %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:723
+#: ceilometer/compute/pollsters/disk.py:645
 #, python-format
 msgid "Ignoring instance %(name)s (%(instance_id)s) : %(error)s"
 msgstr ""
@@ -420,12 +264,12 @@ msgstr ""
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr ""
 
-#: ceilometer/compute/virt/hyperv/utilsv2.py:223
+#: ceilometer/compute/virt/hyperv/utilsv2.py:221
 #, python-format
 msgid "VM %s not found on Hyper-V"
 msgstr ""
 
-#: ceilometer/compute/virt/hyperv/utilsv2.py:225
+#: ceilometer/compute/virt/hyperv/utilsv2.py:223
 #, python-format
 msgid "Duplicate VM name found: %s"
 msgstr ""
@@ -458,150 +302,79 @@ msgid ""
 "from libvirt: %(error)s"
 msgstr ""
 
-#: ceilometer/compute/virt/vmware/inspector.py:107
-#: ceilometer/compute/virt/vmware/inspector.py:124
-#: ceilometer/compute/virt/vmware/inspector.py:156
-#: ceilometer/compute/virt/vmware/inspector.py:169
+#: ceilometer/compute/virt/vmware/inspector.py:106
+#: ceilometer/compute/virt/vmware/inspector.py:123
+#: ceilometer/compute/virt/vmware/inspector.py:155
+#: ceilometer/compute/virt/vmware/inspector.py:168
 #, python-format
 msgid "VM %s not found in VMware vSphere"
 msgstr ""
 
-#: ceilometer/compute/virt/xenapi/inspector.py:57
+#: ceilometer/compute/virt/xenapi/inspector.py:53
 msgid "XenAPI not installed"
 msgstr ""
 
-#: ceilometer/compute/virt/xenapi/inspector.py:63
+#: ceilometer/compute/virt/xenapi/inspector.py:59
 msgid "Must specify connection_url, and connection_password to use"
 msgstr ""
 
-#: ceilometer/compute/virt/xenapi/inspector.py:66
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr ""
-
-#: ceilometer/compute/virt/xenapi/inspector.py:74
+#: ceilometer/compute/virt/xenapi/inspector.py:67
 #, python-format
 msgid "Could not connect to XenAPI: %s"
 msgstr ""
 
-#: ceilometer/compute/virt/xenapi/inspector.py:97
+#: ceilometer/compute/virt/xenapi/inspector.py:90
 #, python-format
 msgid "VM %s not found in XenServer"
 msgstr ""
 
-#: ceilometer/compute/virt/xenapi/inspector.py:100
+#: ceilometer/compute/virt/xenapi/inspector.py:93
 #, python-format
 msgid "Multiple VM %s found in XenServer"
 msgstr ""
 
-#: ceilometer/compute/virt/xenapi/inspector.py:113
+#: ceilometer/compute/virt/xenapi/inspector.py:106
 #, python-format
 msgid "Could not get VM %s CPU Utilization"
 msgstr ""
 
-#: ceilometer/dispatcher/__init__.py:51
-#, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr ""
-
-#: ceilometer/dispatcher/gnocchi.py:53
+#: ceilometer/dispatcher/gnocchi.py:60
 msgid ""
 "The Yaml file that defines mapping between samples and gnocchi "
 "resources/metrics"
 msgstr ""
 
-#: ceilometer/dispatcher/gnocchi_client.py:249
-#, 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_client.py:273
-#, python-format
-msgid ""
-"Resource %(resource_id)s creation failed with status: %(status_code)d: "
-"%(msg)s"
-msgstr ""
-
-#: ceilometer/dispatcher/gnocchi_client.py:293
-#, python-format
-msgid ""
-"Resource %(resource_id)s update failed with status: %(status_code)d: "
-"%(msg)s"
-msgstr ""
-
-#: ceilometer/dispatcher/gnocchi_client.py:317
-#, python-format
-msgid ""
-"Fail to create metric %(metric_name)s of resource %(resource_id)s with "
-"status: %(status_code)d: %(msg)s"
-msgstr ""
-
-#: ceilometer/dispatcher/http.py:82
+#: ceilometer/dispatcher/http.py:76
 msgid ""
 "Dispatcher target was not set, no meter will be posted. Set the target in"
 " the ceilometer.conf file"
 msgstr ""
 
-#: ceilometer/dispatcher/http.py:120
+#: ceilometer/dispatcher/http.py:104
 #, python-format
 msgid "Failed to record metering data: %s"
 msgstr ""
 
-#: ceilometer/dispatcher/http.py:123
+#: ceilometer/dispatcher/http.py:107
 #, python-format
 msgid "message signature invalid, discarding message: %r"
 msgstr ""
 
-#: ceilometer/event/converter.py:80
-#, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr ""
-
-#: ceilometer/event/converter.py:89
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr ""
-
-#: ceilometer/event/converter.py:99
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr ""
-
-#: ceilometer/event/converter.py:114
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: "
-"%(err)s"
-msgstr ""
-
-#: ceilometer/event/converter.py:120
+#: ceilometer/event/converter.py:62
 #, python-format
 msgid "Invalid trait type '%(type)s' for trait %(trait)s"
 msgstr ""
 
-#: ceilometer/event/converter.py:179
+#: ceilometer/event/converter.py:106
 #, python-format
 msgid "Required field %s not specified"
 msgstr ""
 
-#: ceilometer/event/converter.py:356
+#: ceilometer/event/converter.py:283
 #, python-format
 msgid "Dropping Notification %(type)s (uuid:%(msgid)s)"
 msgstr ""
 
-#: ceilometer/event/converter.py:390
-#, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s,"
-" column: %(column)s."
-msgstr ""
-
-#: ceilometer/event/converter.py:396
-#, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr ""
-
 #: ceilometer/hardware/discovery.py:95
 #, python-format
 msgid "Couldn't obtain IP address of instance %s"
@@ -633,7 +406,7 @@ msgstr ""
 
 #: ceilometer/ipmi/pollsters/node.py:66
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
+msgid "Polling %(name)s failed for %(cnt)s times!"
 msgstr ""
 
 #: ceilometer/ipmi/pollsters/node.py:71 ceilometer/ipmi/pollsters/sensor.py:74
@@ -663,7 +436,7 @@ msgstr ""
 
 #: ceilometer/network/services/lbaas.py:152
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
+msgid "Unknown status %(stat)s received on member %(id)s, skipping sample"
 msgstr ""
 
 #: ceilometer/network/services/lbaas.py:255
@@ -673,7 +446,7 @@ msgstr ""
 
 #: ceilometer/network/services/vpnaas.py:49
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
+msgid "Unknown status %(stat)s received on vpn %(id)s, skipping sample"
 msgstr ""
 
 #: ceilometer/network/statistics/opencontrail/client.py:58
@@ -704,22 +477,22 @@ msgstr ""
 msgid "max_bytes and backup_count should be numbers."
 msgstr ""
 
-#: ceilometer/publisher/messaging.py:106
+#: ceilometer/publisher/messaging.py:95
 #, python-format
 msgid "Publishing policy is unknown (%s) force to default"
 msgstr ""
 
-#: ceilometer/publisher/messaging.py:159
+#: ceilometer/publisher/messaging.py:147
 #, python-format
 msgid "Publisher max local_queue length is exceeded, dropping %d oldest samples"
 msgstr ""
 
-#: ceilometer/publisher/messaging.py:171
+#: ceilometer/publisher/messaging.py:159
 #, python-format
 msgid "Failed to publish %d datapoints, queue them"
 msgstr ""
 
-#: ceilometer/publisher/messaging.py:175
+#: ceilometer/publisher/messaging.py:163
 #, python-format
 msgid "Failed to publish %d datapoints, dropping them"
 msgstr ""
@@ -728,7 +501,7 @@ msgstr ""
 msgid "Unable to send sample over UDP"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:307
+#: ceilometer/storage/impl_sqlalchemy.py:310
 #, python-format
 msgid "Unknown metadata type. Key (%s) will not be queryable."
 msgstr ""
@@ -738,19 +511,19 @@ msgstr ""
 msgid "Cannot create table %(table_name)s   it already exists. Ignoring error"
 msgstr ""
 
-#: ceilometer/storage/mongo/utils.py:274
+#: ceilometer/storage/mongo/utils.py:269
 #, python-format
 msgid "Unable to connect to the database server: %(errmsg)s."
 msgstr ""
 
-#: ceilometer/storage/mongo/utils.py:413
+#: ceilometer/storage/mongo/utils.py:411
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. "
 "Giving up."
 msgstr ""
 
-#: ceilometer/storage/mongo/utils.py:417
+#: ceilometer/storage/mongo/utils.py:415
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb: %(errmsg)s. Trying again in "
diff --git a/ceilometer/locale/de/LC_MESSAGES/ceilometer.po b/ceilometer/locale/de/LC_MESSAGES/ceilometer.po
index 2f271634..51ab8071 100644
--- a/ceilometer/locale/de/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/de/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# German translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -10,82 +10,25 @@
 # Tom Cocozzello <tjcocozz@us.ibm.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: German\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s nicht gefunden"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(rule)s muss für den Alarmtyp %(type)s gesetzt sein"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s und %(rule2)s können nicht gleichzeitig festgelegt werden"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d Datenpunkte sind unbekannt"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"Aktion %(scheme)s für Alarm %(alarm_id)s ist unbekannt; keine "
-"Benachrichtigung möglich"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "Alarm %(alarm_id)s nicht gefunden in Projekt %(project)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "Alarm %s nicht gefunden"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"Alarmkombinationsregel sollte mindestens zwei unterschiedliche Alarm-IDs "
-"enthalten."
-
-msgid "Alarm incorrect"
-msgstr "Alaram inkorrekt"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "Alarmquote überschritten für Benutzer %(u)s bei Projekt %(p)s"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"Alarm, wenn %(meter_name)s %(comparison_operator)s ein %(statistic)s von "
-"%(threshold)s über %(period)s Sekunden ist"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "Alarm mit Name=%s existiert"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "Alarm mit name='%s' vorhanden"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "Alarme %(alarm_ids)s sind in unbekanntem Status"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr ""
 "Arithmetiktransformer muss mindestens eine Messgröße im Ausdruck '%s' "
@@ -98,15 +41,6 @@ msgstr ""
 "ist. Fehler wird ignoriert"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr ""
-"Der Alarm %s selbst kann nicht in der Kombinationsregel angegeben werden"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Kombinierter Alarmstatus %s"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Fortfahren nach Fehler von %(name)s: %(error)s"
 
@@ -157,14 +91,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "Fehler bei Auswertung der HTTP-Antwort %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "Fehler beim Übergeben von Alarm: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "Fehler beim Verwenden von Alarm: %s"
-
 msgid "Event"
 msgstr "Ereignis"
 
@@ -172,10 +98,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "Ausdruck ergab einen NaN-Wert!"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "Alarm %s konnte nicht ausgewertet werden"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "Fehler beim Importieren der Erweiterung für %(name)s: %(error)s"
 
@@ -204,10 +126,6 @@ msgstr ""
 "%(id)s>, Informationen können nicht von libvirt abgerufen werden."
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "Es konnten keine Dispatcher für %s geladen werden"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "Es konnten keine Benachrichtigungshandler für %s geladen werden"
 
@@ -246,14 +164,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Pool %(pool_id)s wird ignoriert: %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"Ungültige YAML-Syntax in Ereignisdefinitionsdatei %(file)s in Zeile: "
-"%(line)s, Spalte: %(column)s."
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "Ungültiger Zeitraum %(period)s: %(err)s"
 
@@ -277,10 +187,6 @@ msgstr ""
 "Angabe von connection_url und connection_password für die Verwendung "
 "erforderlich"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "Kein Plug-in mit dem Namen %(plugin)s verfügbar für Trait %(trait)s"
-
 msgid "Node Manager init failed"
 msgstr "Initialisierung von Node Manager fehlgeschlagen"
 
@@ -300,12 +206,6 @@ msgstr "Opencontrail-API hat Folgendes zurückgegeben: %(status)s %(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "Ausdruck für 'Sortieren nach' nicht gültig: %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"Analysefehler in JSONPath-Spezifikation '%(jsonpath)s' für %(trait)s: %(err)s"
-
 msgid "Period must be positive."
 msgstr "Zeitraum muss positiv sein."
 
@@ -327,18 +227,10 @@ msgstr ""
 "%(smp)s"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr "Plug-in angegeben, aber kein Plug-in-Name für Trait %s angegeben"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "Polling von %(mtr)s-Sensor %(cnt)s Mal fehlgeschlagen!"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "Polling von %(name)s %(cnt)s Mal fehlgeschlagen!"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "Pollster für %s ist inaktiviert!"
 
@@ -364,20 +256,6 @@ msgstr ""
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "RGW-AdminOps-API hat Folgendes zurückgegeben: %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Verbleibend %(state)s aufgrund von %(count)d Stichproben %(disposition)s "
-"Schwellenwert, aktuellster: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Verbleibt als %(state)s aufgrund von Alarmen %(alarm_ids)s in Status "
-"%(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr ""
 "Anforderung konnte keine Verbindung mit OpenDaylight über NorthBound REST-"
@@ -387,10 +265,6 @@ msgstr ""
 msgid "Required field %s not specified"
 msgstr "Erforderliches Feld %s nicht angegeben"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "Erforderliches Feld in Traitdefinition nicht angegeben: '%s'"
-
 msgid "Resource"
 msgstr "Resource"
 
@@ -416,26 +290,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "Der Pfad für den Datei-Publisher ist erforderlich"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr "Zeitvorgabennamen müssen für einen angegebenen Alarm eindeutig sein."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "Zeitzone %s ist nicht gültig"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Übergang in %(state)s aufgrund von %(count)d Stichproben %(disposition)s "
-"Schwellenwert, aktuellster: %(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Übergang in %(state)s aufgrund von Alarmen %(alarm_ids)s in Status%(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UPD: Von %s gesendete Daten konnten nicht dekodiert werden"
@@ -471,24 +325,6 @@ msgstr "Publisher %s kann nicht geladen werden"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Hypervisorinspector %s kann nicht geladen werden"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "Anmeldung bei XenAPI nicht möglich (Dom0-Datenträger voll?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "Alarm %s kann nicht benachrichtigt werden"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "Für einen Alarm ohne Aktion kann nicht benachrichtigt werden"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "Aktion %(action)s konnte nicht für %(alarm_id)s analysiert werden"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "Aktion %s konnte nicht analysiert werden"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -530,12 +366,6 @@ msgstr ""
 "übersprungen"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr ""
-"Unbekannten Status %(stat)s erhalten für Mitglied %(id)s; Beispiel wird "
-"übersprungen"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 "Unbekannten Status %(stat)s erhalten für Pool %(id)s; Beispiel wird "
@@ -548,16 +378,6 @@ msgstr ""
 "übersprungen"
 
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-msgstr ""
-"Unbekannten Status %(stat)s erhalten für VPN %(id)s; Beispiel wird "
-"übersprungen"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "Nicht unterstützte Aktion %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "VM %s in XenServer nicht gefunden"
 
@@ -572,26 +392,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI nicht installiert"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "YAML-Fehler beim Lesen von Ereignisdefinitionsdatei %(file)s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "Der Zyklus für die Alarmauswertung ist fehlgeschlagen"
-
-msgid "alarm retrieval failed"
-msgstr "Abrufen des Alarms fehlgeschlagen"
-
-msgid "alarm state update failed"
-msgstr "Aktualisierung des Alarmzustands ist fehlgeschlagen"
-
-msgid "alarm stats retrieval failed"
-msgstr "Abrufen der Alarmstatistiken ist fehlgeschlagen"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "Abrufen der Alarmstatistiken ist fehlgeschlagen: %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "Abruf von CPU-Zeit nicht möglich für %(id)s: %(e)s"
 
@@ -619,12 +419,3 @@ msgstr "Analyse von IPMI-Sensordaten fehlgeschlagen, unbekannter Sensortyp"
 
 msgid "running ipmitool failure"
 msgstr "Fehler beim Ausführen von ipmitool"
-
-msgid "state invalid"
-msgstr "Zustand ungültig"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp sollte ein datetime-Objekt sein"
-
-msgid "timestamp should be datetime object"
-msgstr "timestamp sollte ein datetime-Objekt sein"
diff --git a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
index 8c9c8673..c8267b65 100644
--- a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# English (United Kingdom) translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -7,87 +7,29 @@
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language: en_GB\n"
+"Language: en-GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: English (United Kingdom)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s Not Found"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(rule)s must be set for %(type)s type alarm"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d datapoints are unknown"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "Alarm %(alarm_id)s not found in project %(project)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "Alarm %s not found"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"Alarm combination rule should contain at least two different alarm ids."
-
-msgid "Alarm incorrect"
-msgstr "Alarm incorrect"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "Alarm quota exceeded for user %(u)s on project %(p)s"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "Alarm with name=%s exists"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "Alarm with name='%s' exists"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "Alarms %(alarm_ids)s are in unknown state"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr "Arithmetic transformer must use at least one meter in expression '%s'"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "Cannot specify alarm %s itself in combination rule"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Combined state of alarms %s"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Continue after error from %(name)s: %(error)s"
 
@@ -119,14 +61,6 @@ msgstr "Duplicate VM name found: %s"
 msgid "Error parsing HTTP response: %s"
 msgstr "Error parsing HTTP response: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "Error while posting alarm: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "Error while putting alarm: %s"
-
 msgid "Event"
 msgstr "Event"
 
@@ -134,10 +68,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "Expression evaluated to a NaN value!"
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "Failed to load any dispatchers for %s"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "Failed to load any notification handlers for %s"
 
@@ -158,14 +88,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Ignoring pool %(pool_id)s: %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-
-#, python-format
 msgid "Invalid trait type '%(type)s' for trait %(trait)s"
 msgstr "Invalid trait type '%(type)s' for trait %(trait)s"
 
@@ -184,10 +106,6 @@ msgid "Must specify connection_url, and connection_password to use"
 msgstr "Must specify connection_url, and connection_password to use"
 
 #, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "No plugin named %(plugin)s available for trait %(trait)s"
-
-#, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
 msgstr "Not Authorised to access %(aspect)s %(id)s"
 
@@ -199,12 +117,6 @@ msgstr "OpenDaylitght API returned %(status)s %(reason)s"
 msgid "Opencontrail API returned %(status)s %(reason)s"
 msgstr "Opencontrail API returned %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-
 msgid "Period must be positive."
 msgstr "Period must be positive."
 
@@ -225,10 +137,6 @@ msgstr ""
 "%(smp)s"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr "Plugin specified, but no plugin name supplied for trait %s"
-
-#, python-format
 msgid ""
 "Publisher max local_queue length is exceeded, dropping %d oldest samples"
 msgstr ""
@@ -238,18 +146,6 @@ msgstr ""
 msgid "Publishing policy is unknown (%s) force to default"
 msgstr "Publishing policy is unknown (%s) force to default"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "Request failed to connect to OpenDaylight with NorthBound REST API"
 
@@ -257,10 +153,6 @@ msgstr "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgid "Required field %s not specified"
 msgstr "Required field %s not specified"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "Required field in trait definition not specified: '%s'"
-
 msgid "Resource"
 msgstr "Resource"
 
@@ -282,25 +174,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "The path for the file publisher is required"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr "Time constraint names must be unique for a given alarm."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "Timezone %s is not valid"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: Cannot decode data sent by %s"
@@ -330,20 +203,6 @@ msgstr "Unable to load publisher %s"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Unable to load the hypervisor inspector: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "Unable to log in to XenAPI (is the Dom0 disk full?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "Unable to notify alarm %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "Unable to notify for an alarm with no action"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "Unable to parse action %(action)s for alarm %(alarm_id)s"
-
 msgid "Unable to send sample over UDP"
 msgstr "Unable to send sample over UDP"
 
@@ -366,10 +225,6 @@ msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr "Unknown status %(stat)s received on member %(id)s,skipping sample"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 
@@ -378,10 +233,6 @@ msgid "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 msgstr "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-msgstr "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "VM %s not found in XenServer"
 
@@ -393,22 +244,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI not installed"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "YAML error reading Event Definitions file %(file)s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "alarm evaluation cycle failed"
-
-msgid "alarm retrieval failed"
-msgstr "alarm retrieval failed"
-
-msgid "alarm state update failed"
-msgstr "alarm state update failed"
-
-msgid "alarm stats retrieval failed"
-msgstr "alarm stats retrieval failed"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "could not get CPU time for %(id)s: %(e)s"
 
@@ -422,6 +257,3 @@ msgstr "max_bytes and backup_count should be numbers."
 #, python-format
 msgid "message signature invalid, discarding message: %r"
 msgstr "message signature invalid, discarding message: %r"
-
-msgid "state invalid"
-msgstr "state invalid"
diff --git a/ceilometer/locale/es/LC_MESSAGES/ceilometer.po b/ceilometer/locale/es/LC_MESSAGES/ceilometer.po
index 83bec2f7..2b608d10 100644
--- a/ceilometer/locale/es/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/es/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# Spanish translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -9,83 +9,25 @@
 # Tom Cocozzello <tjcocozz@us.ibm.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: Spanish\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s No encontrado"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(rule)s debe establecerse para la alarma de tipo %(type)s"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s y %(rule2)s no se pueden establecer al mismo tiempo"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "puntos de datos %d son desconocidos"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"La acción %(scheme)s para la alarma %(alarm_id)s es desconocida, no se puede "
-"notificar"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "La alarma %(alarm_id)s no se ha encontrado en el proyecto %(project)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "No se ha encontrado la alarma %s"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"La regla de combinación de alarma debe contener al menos dos ID de alarma "
-"diferentes."
-
-msgid "Alarm incorrect"
-msgstr "Alarma incorrecta"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr ""
-"La cuota de alarma se ha excedido para el usuario %(u)s en el proyecto %(p)s"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"Alarma cuando %(meter_name)s es %(comparison_operator)s un %(statistic)s de "
-"%(threshold)s por encima de %(period)s segundos"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "Ya existe la alarma con el nombre=%s"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "Existe alarma con nombre='%s'"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "Las alarmas %(alarm_ids)s están en estado desconocido"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr ""
 "El transformador aritmético debe utilizar al menos un medidor en la "
@@ -97,14 +39,6 @@ msgstr ""
 "No se puede crear la tabla %(table_name)s, ya existe. Se ignorará el error."
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "No se puede especificar la propia alarma %s en la regla de combinación"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Estado combinado de alarmas %s"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Continuar después de error desde %(name)s: %(error)s"
 
@@ -155,14 +89,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "Error analizándo respuesta HTTP: %s."
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "Error al contabilizar alarma: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "Error al poner alarma: %s"
-
 msgid "Event"
 msgstr "Suceso"
 
@@ -170,10 +96,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "La expresión se ha evaluado en un valor NaN."
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "No se ha podido evaluar la alarma %s"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "No se ha podido importar la extensión para %(name)s: %(error)s"
 
@@ -202,10 +124,6 @@ msgstr ""
 "id=%(id)s>, no se puede obtener información de libvirt."
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "No se ha podido cargar ningún asignador para %s"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "No se ha podido cargar ningún manejador de notificación para %s"
 
@@ -242,14 +160,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Se ignora la agrupación %(pool_id)s: %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"Sintaxis de YAML no válida en archivo de definiciones de sucesos %(file)s en "
-"la línea: %(line)s, columna: %(column)s."
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "Periodo no válido %(period)s: %(err)s"
 
@@ -273,12 +183,6 @@ msgid "Must specify connection_url, and connection_password to use"
 msgstr ""
 "Debe especificar el url_conexión y la contraseña_conexión para utilizar"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr ""
-"No hay ningún plug-in denominado %(plugin)s disponible para el rasgo "
-"%(trait)s"
-
 msgid "Node Manager init failed"
 msgstr "El inicio de Gestor de nodos ha fallado"
 
@@ -298,13 +202,6 @@ msgstr "La API Opencontrail ha devuelto %(status)s %(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "Expresión de ordenar por no válida: %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"Error de análisis en especificación de JSONPath '%(jsonpath)s' para "
-"%(trait)s: %(err)s"
-
 msgid "Period must be positive."
 msgstr "El período debe ser positivo."
 
@@ -327,20 +224,10 @@ msgstr ""
 "para %(smp)s"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr ""
-"Se ha especificado plug-in, pero no se ha proporcionado ningún nombre de "
-"plug-in para el rasgo %s"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "¡El sensor de sondeo %(mtr)s ha fallado %(cnt)s veces!"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "¡El sondeo %(name)s ha fallado %(cnt)s veces!"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "¡El Pollster para %s está inhabilitado!"
 
@@ -365,20 +252,6 @@ msgstr ""
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "La API de RGW AdminOps ha devuelto %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Restante como %(state)s debido a %(count)d muestras %(disposition)s umbral, "
-"más reciente: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Permaneciendo como %(state)s debido a las alarmas %(alarm_ids)s en el estado "
-"%(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr ""
 "La solicitud no ha podido conectar con OpenDaylight con la API REST "
@@ -388,10 +261,6 @@ msgstr ""
 msgid "Required field %s not specified"
 msgstr "Campo necesario %s no especificado"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "Campo necesario en definición de rasgo no especificado: '%s'"
-
 msgid "Resource"
 msgstr "Recurso"
 
@@ -418,28 +287,6 @@ msgid "The path for the file publisher is required"
 msgstr ""
 "La vía de acceso para la aplicación de publicación de archivos es necesaria"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr ""
-"Los nombres de restricción de tiempo deben ser exclusivos para una "
-"determinada alarma."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "El huso horario %s no es válido"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"La transición a %(state)s debido a %(count)d muestras %(disposition)s "
-"umbral, más reciente: %(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Transición a %(state)s debido a las alarmas %(alarm_ids)s en estado %(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: no se puede decodificar los datos enviados por %s"
@@ -474,24 +321,6 @@ msgstr "No se puede cargar la aplicación de publicación %s"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "No se puede cargar el inspector de hipervisor: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "No se puede iniciar la sesión en XenAPI (¿está el disco Dom0 lleno?) "
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "No se puede notificar la alarma %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "No se puede notificar una alarma sin acción"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "No se puede analizar la acción %(action)s para la alarma %(alarm_id)s"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "No se puede analizar la acción %s"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -533,12 +362,6 @@ msgstr ""
 "ejemplo"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr ""
-"Se ha recibido un estado desconocido %(stat)s en el miembro %(id)s, se omite "
-"el ejemplo"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 "Se ha recibido un estado desconocido %(stat)s en la agrupación %(id)s, se "
@@ -551,16 +374,6 @@ msgstr ""
 "ejemplo"
 
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-msgstr ""
-"Se ha recibido un estado desconocido %(stat)s en vpn %(id)s, se omite el "
-"ejemplo"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "Acción %s no admitida"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "No se han encontrado VM %s en XenServer"
 
@@ -575,26 +388,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI no está instalado"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "Error de YAML al leer el archivo de definiciones de sucesos %(file)s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "ha fallado el ciclo de evaluación de alarma"
-
-msgid "alarm retrieval failed"
-msgstr "ha fallado la recuperación de alarma"
-
-msgid "alarm state update failed"
-msgstr "ha fallado la actualización de estado de la alarma"
-
-msgid "alarm stats retrieval failed"
-msgstr "ha fallado la recuperación de estadísticas de la alarma"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "la recuperación de estadísticas de la alarma ha fallado %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "no se ha podido obtener tiempo de CPU para %(id)s: %(e)s"
 
@@ -623,13 +416,3 @@ msgstr ""
 
 msgid "running ipmitool failure"
 msgstr "fallo de ejecución de ipmitool"
-
-msgid "state invalid"
-msgstr "estado no válido"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp debe ser el objeto datetime"
-
-msgid "timestamp should be datetime object"
-msgstr ""
-"La indicación de fecha y hora debe ser el objeto datetime (fecha y hora)"
diff --git a/ceilometer/locale/fr/LC_MESSAGES/ceilometer.po b/ceilometer/locale/fr/LC_MESSAGES/ceilometer.po
index ff86ec1f..8ed6e7a9 100644
--- a/ceilometer/locale/fr/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/fr/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# French translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -10,91 +10,40 @@
 # EVEILLARD <stephane.eveillard@gmail.com>, 2013-2014
 # Francesco Vollero <fvollero@redhat.com>, 2015
 # Jonathan Dupart <jonathan+transifex@dupart.org>, 2014
+# CHABERT Loic <chabert.loic.74@gmail.com>, 2013
 # Maxime COQUEREL <max.coquerel@gmail.com>, 2014
 # Nick Barcet <nicolas@barcet.com>, 2013
+# Nick Barcet <nicolas@barcet.com>, 2013
 # Andrew Melim <nokostya.translation@gmail.com>, 2014
 # Patrice LACHANCE <patlachance@gmail.com>, 2013
+# Patrice LACHANCE <patlachance@gmail.com>, 2013
 # Rémi Le Trocquer <remi.letrocquer@orange.com>, 2014
 # EVEILLARD <stephane.eveillard@gmail.com>, 2013
+# Corinne Verheyde <cverheyd@hotmail.com>, 2013
+# Corinne Verheyde <cverheyd@hotmail.com>, 2013
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 # Tom Cocozzello <tjcocozz@us.ibm.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: French\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s n'a pas été trouvé"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(rule)s doit être défini pour l'alarme de type %(type)s"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s et %(rule2)s ne peuvent pas être définis en même temps"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "Points de données %d inconnu"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"Action %(scheme)s inconnue pour l'alerte %(alarm_id)s, impossible de notifier"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "Alarme %(alarm_id)s introuvable dans le projet %(project)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "Alarme: %s non trouvé"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"La règle de combinaison d'alarmes doit contenir au moins deux "
-"identificateurs d'alarme différents."
-
-msgid "Alarm incorrect"
-msgstr "Alarme incorrecte"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "Quota d'alarme dépassé pour l'utilisateur %(u)s sur le projet %(p)s"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"Alarme lorsque %(meter_name)s est %(comparison_operator)s à une "
-"%(statistic)s de %(threshold)s de plus de %(period)s secondes"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "Alarme avec le nom=%s existe déjà"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "Une alarme du nom='%s' existe déjà"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "Les alarmes %(alarm_ids)s sont dans un état inconnu"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr ""
 "Le transformateur arithmétique doit utiliser au moins un mètre dans "
@@ -107,15 +56,6 @@ msgstr ""
 "ignorée"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr ""
-"Impossible d'indiquer l'alarme %s elle-même dans la règle de combinaison"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Etat combiné des alarmes %s"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Continue après l'erreur %(name)s: %(error)s "
 
@@ -167,14 +107,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "Erreur lors de l'analyse syntaxique de la réponse: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "Erreur lors de l'envoi de l'alarme : %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "Erreur lors du placement de l'alarme: %s"
-
 msgid "Event"
 msgstr "Événement"
 
@@ -182,10 +114,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "Expression évaluée avec une valeur not-a-number !"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "Echec de l'évaluation de l'alarme %s"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "Echec de l'importation de l'extension pour %(name)s: %(error)s"
 
@@ -214,10 +142,6 @@ msgstr ""
 "%(name)s, id=%(id)s>. Impossible d'obtenir des informations de libvirt."
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "Échec du chargement d'aucun répartiteur pour %s"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "Échec du chargement de tous les gestionnaires de notification pour %s"
 
@@ -256,14 +180,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Le pool %(pool_id)s est ignoré : %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"Syntaxe YAML non valide dans le fichier de définitions d'événement %(file)s "
-"à la ligne : %(line)s, colonne : %(column)s."
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "Période %(period)s non valide : %(err)s"
 
@@ -287,11 +203,6 @@ msgstr "Plusieurs machines virtuelles %s trouvées dans XenServer"
 msgid "Must specify connection_url, and connection_password to use"
 msgstr "Il faut indiquer connection_url et connection_password pour utiliser"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr ""
-"Aucun plug-in nommé %(plugin)s n'est disponible pour le trait %(trait)s"
-
 msgid "Node Manager init failed"
 msgstr "Echec de l'initialisation du gestionnaire de noeud"
 
@@ -311,13 +222,6 @@ msgstr "L'API Opencontrail a renvoyé %(status)s %(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "L'expression de tri n'est pas valide : %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"Erreur d'analyse dans la spécification JSONPath '%(jsonpath)s' pour "
-"%(trait)s : %(err)s"
-
 msgid "Period must be positive."
 msgstr "La période doit être positive."
 
@@ -338,19 +242,10 @@ msgstr ""
 "%(smp)s"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr ""
-"Plug-in spécifié, mais aucun nom de plug-in n'est fourni pour le trait %s"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "L'interrogation du capteur %(mtr)s a échoué %(cnt)s fois !"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "L'interrogation de %(name)s a échoué %(cnt)s fois !"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "Le pollster pour %s est désactivé !"
 
@@ -373,20 +268,6 @@ msgstr "La politique de publication est inconnue (%s) forcé le défaut"
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "L'API AdminOps RGW a renvoyé %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Reste dans l'état %(state)s à cause de %(count)d échantillons "
-"%(disposition)s au seuil, le plus récent: %(most_recent)s "
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Reste dans l\"état %(state)s car toutes les alarmes %(alarm_ids)s sont dans "
-"l'état %(state)s."
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr ""
 "La demande n'a pas réussi à se connecter à OpenDaylight avec l'API REST "
@@ -396,11 +277,6 @@ msgstr ""
 msgid "Required field %s not specified"
 msgstr "Champ requis %s non spécifiée"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr ""
-"Une zone obligatoire dans la définition de trait n'est pas spécifiée : '%s'"
-
 msgid "Resource"
 msgstr "Ressource"
 
@@ -426,28 +302,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "Le chemin du éditeur de fichier est obligatoire "
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr ""
-"Les noms de contrainte de temps doivent être uniques pour une alarme donnée."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "La timezone %s n'est pas valide"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Transition vers l'état %(state)s à cause de %(count)d échantillons "
-"%(disposition)s au seuil, le plus récent: %(most_recent)s "
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Transition vers %(state)s car les alarmes %(alarm_ids)s sont dans l'état   "
-"%(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: Impossible de décoder les données envoyées par %s"
@@ -482,24 +336,6 @@ msgstr "Impossible de charger l'éditeur %s "
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Impossible de télécharger  l'inspecteur hypervisor: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "Impossible de se connecter à XenAPI (disque Dom0 plein ?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "Impossible de notifier l'alerte %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "Impossible de notifier une alerte sans action"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "Impossible d'analyser l'action %(action)s pour l'alerte %(alarm_id)s"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "Impossible d'analyser l'action %s"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -539,10 +375,6 @@ msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr "Etat %(stat)s inconnu reçu sur le pare-feu %(id)s, échantillon ignoré"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr "Etat %(stat)s inconnu reçu sur le membre %(id)s, échantillon ignoré"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr "Etat %(stat)s inconnu reçu sur le pool %(id)s, échantillon ignoré"
 
@@ -552,14 +384,6 @@ msgstr ""
 "Etat %(stat)s inconnu reçu sur l'IP virtuelle %(id)s, échantillon ignoré"
 
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-msgstr "Etat %(stat)s inconnu sur le vpn %(id)s, échantillon ignoré"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "Action non supporté %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "VM %s non trouvé dans XenServer"
 
@@ -574,27 +398,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI n'est pas installé"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr ""
-"Erreur YAML lors de la lecture du fichier de définitions d'événement %(file)s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "Échec du cycle d'évaluation de l'alarme"
-
-msgid "alarm retrieval failed"
-msgstr "Échec de la récupération de l'alerte"
-
-msgid "alarm state update failed"
-msgstr "Échec de la mise à jour de l'état de l'alerte"
-
-msgid "alarm stats retrieval failed"
-msgstr "Échec de la récupération de l'état de l'alerte"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "échec de la récupération des stats d'alarme : %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "impossible d'obtenir le temps UC pour %(id)s : %(e)s"
 
@@ -623,12 +426,3 @@ msgstr ""
 
 msgid "running ipmitool failure"
 msgstr "Echec d'exécution d'ipmitool"
-
-msgid "state invalid"
-msgstr "Etat non valide"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp doit correspondre à l'objet date-heure"
-
-msgid "timestamp should be datetime object"
-msgstr "timestamp doit correspondre à l'objet date-heure"
diff --git a/ceilometer/locale/it/LC_MESSAGES/ceilometer.po b/ceilometer/locale/it/LC_MESSAGES/ceilometer.po
index 3b4cb829..5043a82b 100644
--- a/ceilometer/locale/it/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/it/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# Italian translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -8,82 +8,25 @@
 # Tom Cocozzello <tjcocozz@us.ibm.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: Italian\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s non trovato"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(rule)s deve essere impostata per la segnalazione di tipo %(type)s"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s e %(rule2)s non possono essere impostate contemporaneamente"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "i datapoint %d sono sconosciuti"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"Azione %(scheme)s per la segnalazione %(alarm_id)s è sconosciuta, "
-"impossibile notificare"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "Segnalazione %(alarm_id)s non trovata nel progetto %(project)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "Segnalazione %s non trovata"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"La regola di combinazione di segnalazione dovrebbe contenere almeno due "
-"differenti ID segnalazione."
-
-msgid "Alarm incorrect"
-msgstr "Segnalazione non corretta"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "Quota di segnalazione superata per l'utente %(u)s nel progetto %(p)s"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"Segnalazione quando %(meter_name)s è %(comparison_operator)s un "
-"%(statistic)s di %(threshold)s in %(period)s secondi"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "Segnalazione con nome=%s esiste"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "Segnalazione con nome='%s' esiste"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "Le segnalazioni %(alarm_ids)s si trovano in uno stato sconosciuto"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr ""
 "Il trasformatore aritmetico deve utilizzare almeno un contatore "
@@ -96,15 +39,6 @@ msgstr ""
 "Ignorare l'errore"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr ""
-"Impossibile specificare la segnalazione stessa %s in combinazione alla regola"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Stato combinato di segnalazioni %s"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Continua dopo errore da %(name)s: %(error)s"
 
@@ -155,14 +89,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "Errore durante l'analisi della risposta HTTP: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "Errore durante invio segnalazione: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "Errore durante inserimento segnalazione: %s"
-
 msgid "Event"
 msgstr "Evento"
 
@@ -170,10 +96,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "Espressione valutata a un valore NaN!"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "Valutazione dell'allarme %s non riuscita"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "Impossibile importare l'estensione per %(name)s: %(error)s"
 
@@ -202,10 +124,6 @@ msgstr ""
 "<nome=%(name)s, id=%(id)s>, impossibile ottenere informazioni da libvirt."
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "Impossibile caricare eventuali dispatcher per %s"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "Impossibile caricare eventuali gestori di notifica per %s"
 
@@ -242,14 +160,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Ignora pool %(pool_id)s: %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"Sintassi YAML non valida nel file delle definizioni dell'evento %(file)s "
-"alla riga: %(line)s, colonna: %(column)s."
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "Periodo non valido %(period)s: %(err)s"
 
@@ -273,12 +183,6 @@ msgid "Must specify connection_url, and connection_password to use"
 msgstr ""
 "È necessario specificare connection_url e connection_password da utilizzare"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr ""
-"Nessun plug-in con nome %(plugin)s disponibile per la caratteristica "
-"%(trait)s"
-
 msgid "Node Manager init failed"
 msgstr "Inizializzazione gestore nodi non riuscita"
 
@@ -298,13 +202,6 @@ msgstr "L'API Opencontrail ha restituito %(status)s %(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "L'espressione ordina per non è valida: %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"Errore di analisi nella specifica JSONPath '%(jsonpath)s' per %(trait)s: "
-"%(err)s"
-
 msgid "Period must be positive."
 msgstr "Il periodo deve essere positivo"
 
@@ -327,20 +224,10 @@ msgstr ""
 "%(smp)s"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr ""
-"Plug-in specificato, ma nessun nome di plug-in fornito per la caratteristica "
-"%s"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "Polling del sensore %(mtr)s non riuscito per %(cnt)s volte!"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "Polling di %(name)s non riuscito per %(cnt)s volte!"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "Pollster per %s disabilitato!"
 
@@ -366,20 +253,6 @@ msgstr ""
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "L'API RGW AdminOps ha restituito %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"%(state)s rimanenti a causa di %(count)d esempi %(disposition)s soglia, più "
-"recente: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Convalida di %(state)s a causa di segnalazioni %(alarm_ids)s nello stato "
-"%(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr ""
 "Richiesta di collegamento a OpenDaylight con API NorthBound REST non riuscita"
@@ -388,11 +261,6 @@ msgstr ""
 msgid "Required field %s not specified"
 msgstr "Campo richiesto %s non specificato"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr ""
-"Campo richiesto nella definizione di caratteristica non specificato: '%s'"
-
 msgid "Resource"
 msgstr "Risorsa"
 
@@ -418,28 +286,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "Il percorso per il publisher di file è obbligatorio"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr ""
-"I nomi dei limiti di tempo devono essere univoci per una data segnalazione."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "Fuso orario %s non valido"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Transizione su %(state)s a causa di %(count)d esempio %(disposition)s "
-"soglia, più recente: %(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Transizione a %(state)s causata da segnalazioni %(alarm_ids)s nello stato "
-"%(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: impossibile decodificare i dati inviati da %s"
@@ -474,25 +320,6 @@ msgstr "Impossibile caricare il publisher %s"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Impossibile caricare il programma di controllo hypervisor: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "Impossibile collegarsi a XenAPI (il disco Dom0 è pieno?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "Impossibile notificare la segnalazione %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "Impossibile notificare una segnalazione senza nessuna azione"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr ""
-"Impossibile analizzare l'azione %(action)s per la segnalazione %(alarm_id)s"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "Impossibile analizzare l'azione %s"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -534,11 +361,6 @@ msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr "Stato non conosciuto %(stat)s ricevuto su fw %(id)s,ignorare l'esempio"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr ""
-"Stato non conosciuto %(stat)s ricevuto sul membro %(id)s,ignorare l'esempio"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 "Stato non conosciuto %(stat)s ricevuto sul pool %(id)s, ignorare l'esempio"
@@ -549,15 +371,6 @@ msgstr ""
 "Stato non conosciuto %(stat)s ricevuto su vip %(id)s, ignorare l'esempio"
 
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-msgstr ""
-"Stato non conosciuto %(stat)s ricevuto su vpn %(id)s,ignorare l'esempio"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "Azione non supportata %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "VM %s non trovata in XenServer"
 
@@ -572,27 +385,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI non installato"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr ""
-"Errore YAML durante la lettura del file definizioni dell'evento %(file)s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "ciclo di valutazione segnalazione non riuscito"
-
-msgid "alarm retrieval failed"
-msgstr "richiamo segnalazione non riuscito"
-
-msgid "alarm state update failed"
-msgstr "segnalazione aggiornamento stato non riuscito"
-
-msgid "alarm stats retrieval failed"
-msgstr "segnalazione richiamo statistiche non riuscito"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "richiamo delle statistiche di segnalazione non riuscito: %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "impossibile ricevere l'ora CPU per %(id)s: %(e)s"
 
@@ -621,12 +413,3 @@ msgstr ""
 
 msgid "running ipmitool failure"
 msgstr "errore nell'esecuzione ipmitool"
-
-msgid "state invalid"
-msgstr "stato non valido"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp deve essere un oggetto data/ora"
-
-msgid "timestamp should be datetime object"
-msgstr "timestamp deve essere un oggetto data/ora"
diff --git a/ceilometer/locale/ja/LC_MESSAGES/ceilometer.po b/ceilometer/locale/ja/LC_MESSAGES/ceilometer.po
index 179eecb3..5f869292 100644
--- a/ceilometer/locale/ja/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/ja/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# Japanese translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -8,81 +8,25 @@
 # Tom Cocozzello <tjcocozz@us.ibm.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-10-12 06:50+0000\n"
 "Last-Translator: Akihiro Motoki <amotoki@gmail.com>\n"
 "Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: Japanese\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s が見つかりません"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(type)s タイプのアラームに %(rule)s を設定する必要があります"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s と %(rule2)s を同時に設定することはできません"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d データポイントが不明です"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"アラーム %(alarm_id)s のアクション %(scheme)s が不明なため、通知できません"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "アラーム %(alarm_id)s がプロジェクト %(project)s には見つかりません"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "アラーム %s が見つかりません"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"アラーム組み合わせルールには、少なくとも 2 つの異なるアラーム ID が含まれてい"
-"る必要があります。"
-
-msgid "Alarm incorrect"
-msgstr "アラームが正しくありません"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "プロジェクト %(p)s のユーザー %(u)s のアラームクォータを超過しました"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"%(period)s 秒にわたる %(meter_name)s と %(threshold)s の %(statistic)s の比較"
-"が %(comparison_operator)s である場合のアラーム"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "name=%s のアラームは存在します"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "name='%s' のアラームは存在します"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "アラーム %(alarm_ids)s は不明な状態にあります"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr ""
 "演算変換プログラムは、式 '%s' で少なくとも 1 つのメーターを使用する必要があり"
@@ -95,14 +39,6 @@ msgstr ""
 "す"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "アラーム %s 自体を組み合わせルールに指定することはできません"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "アラーム %s の結合状態"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "%(name)s からのエラーの後で続行します: %(error)s"
 
@@ -153,14 +89,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "HTTP 応答を解析している際にエラーが発生しました: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "アラームを通知するときにエラーが発生しました: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "アラームを配置するときにエラーが発生しました: %s"
-
 msgid "Event"
 msgstr "イベント"
 
@@ -168,10 +96,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "式が NaN 値に評価されました。"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "アラーム %s の評価に失敗しました"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "%(name)s の拡張機能のインポートに失敗しました: %(error)s"
 
@@ -200,10 +124,6 @@ msgstr ""
 "した。libvirt から情報を取得できません。"
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "%s のディスパッチャーをロードできませんでした"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "%s の通知ハンドラーをロードできませんでした"
 
@@ -240,14 +160,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "プール %(pool_id)s を無視しています: %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"イベント定義ファイル %(file)s に無効な YAML 構文があります: %(line)s 行目の "
-"%(column)s 桁目。"
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "無効な期間 %(period)s: %(err)s"
 
@@ -270,10 +182,6 @@ msgid "Must specify connection_url, and connection_password to use"
 msgstr ""
 "connection_url と、使用する connection_password を指定する必要があります"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "特性 %(trait)s に対して使用できるプラグイン %(plugin)s はありません"
-
 msgid "Node Manager init failed"
 msgstr "ノードマネージャーの初期化に失敗しました"
 
@@ -293,12 +201,6 @@ msgstr "Opencontrail API から %(status)s %(reason)s が返されました"
 msgid "Order-by expression not valid: %s"
 msgstr "order-by 式が無効です: %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"%(trait)s の JSONPath 指定 '%(jsonpath)s' で解析エラーが発生しました: %(err)s"
-
 msgid "Period must be positive."
 msgstr "期間は正の数でなければなりません。"
 
@@ -323,20 +225,10 @@ msgstr ""
 "ラーが発生した後に終了します"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr ""
-"特性 %s に対してプラグインが指定されましたが、プラグイン名が指定されませんで"
-"した"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "センサー %(mtr)s のポーリングが %(cnt)s 回失敗しました"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "%(name)s のポーリングが %(cnt)s 回失敗しましたstar"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "%s の pollster が無効になっています"
 
@@ -361,20 +253,6 @@ msgstr "パブリッシュポリシーが不明です (%s)。強制的にデフ�
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "RGW AdminOps API から %(status)s %(reason)s が返されました"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"%(count)d 個のサンプル %(disposition)s しきい値が原因で %(state)s のままで"
-"す。最新: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"%(state)s のままです。アラーム %(alarm_ids)s の状態が %(state)s であるためで"
-"す"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "NorthBound REST API を使用した OpenDaylight への接続要求が失敗しました"
 
@@ -382,10 +260,6 @@ msgstr "NorthBound REST API を使用した OpenDaylight への接続要求が�
 msgid "Required field %s not specified"
 msgstr "必須フィールド %s が指定されていません"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "特性定義における必須フィールドが指定されていません: '%s'"
-
 msgid "Resource"
 msgstr "リソース"
 
@@ -411,27 +285,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "ファイルパブリッシャーのパスが必要です"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr "時間制約の名前は、指定されたアラームで一意でなければなりません。"
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "タイムゾーン %s が無効です"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"%(count)d 個のサンプルの %(disposition)s しきい値が原因で%(state)s に遷移しま"
-"す。最新: %(most_recent)s"
-
-#, fuzzy, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"%(state)s に移行します。アラーム %(alarm_ids)s の状態が %(state)s であるため"
-"です"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: %s から送信されたデータをデコードできません"
@@ -461,24 +314,6 @@ msgstr "パブリッシャー %s をロードできません"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "ハイパーバイザーインスペクターをロードできません: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "XenAPI にログインできません (Dom0 ディスクフル?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "アラーム %s を通知できません"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "アクションのないアラームは通知できません"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "アラーム %(alarm_id)s のアクション %(action)s を解析できません"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "アクション %s を解析できません"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -519,12 +354,6 @@ msgstr ""
 "キップします"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr ""
-"メンバー %(id)s で不明な状態 %(stat)s を受信しました。サンプルをスキップしま"
-"す"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 "プール %(id)s で不明な状態 %(stat)s を受信しました。サンプルをスキップします"
@@ -535,15 +364,6 @@ msgstr ""
 "仮想 IP %(id)s で不明な状態 %(stat)s を受信しました。サンプルをスキップします"
 
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-msgstr ""
-"VPN %(id)s で不明な状態 %(stat)s を受信しました。サンプルをスキップします"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "サポートされないアクション %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "VM %s が XenServer に見つかりません"
 
@@ -558,28 +378,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI がインストールされていません"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr ""
-"イベント定義ファイル %(file)s を読み取るときに YAML エラーが発生しました"
-
-#, fuzzy
-msgid "alarm evaluation cycle failed"
-msgstr "アラーム評価サイクルで障害が発生しました"
-
-msgid "alarm retrieval failed"
-msgstr "アラームを取得できませんでした"
-
-msgid "alarm state update failed"
-msgstr "アラームの状態を更新できませんでした"
-
-msgid "alarm stats retrieval failed"
-msgstr "アラーム統計の取得に失敗しました"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "アラーム統計の取得に失敗しました: %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "%(id)s の CPU 時間を取得できませんでした: %(e)s"
 
@@ -607,12 +405,3 @@ msgstr "IPMI センサーデータの解析に失敗しました。不明なセ�
 
 msgid "running ipmitool failure"
 msgstr "ipmitool の実行に失敗しました"
-
-msgid "state invalid"
-msgstr "状態が無効です"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp は datetime オブジェクトでなければなりません"
-
-msgid "timestamp should be datetime object"
-msgstr "タイムスタンプは datetime オブジェクトでなければなりません"
diff --git a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po
index 2646dccd..872e9b37 100644
--- a/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/ko_KR/LC_MESSAGES/ceilometer.po
@@ -1,89 +1,36 @@
-# Korean (South Korea) translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
 # Translators:
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
 # Seunghyo Chun <seunghyo.chun@gmail.com>, 2013
+# 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
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language: ko_KR\n"
+"Language: ko-KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: Korean (South Korea)\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s을(를) 찾을 수 없음"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(type)s 유형 알람에 %(rule)s을(를) 설정해야 함"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s 및 %(rule2)s을(를) 동시에 설정할 수 없음"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d 데이터포인트를 알 수 없습니다. "
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"%(alarm_id)s 알람에 대한 %(scheme)s 조치를 알 수 없어 알림을 전송할 수 없습니"
-"다. "
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "%(alarm_id)s 알람이 %(project)s 프로젝트에 없음"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "%s 알람을 찾을 수 없음"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr "알람 조합 규칙에 서로 다른 알람 ID가 둘 이상 포함되어야 합니다."
-
-msgid "Alarm incorrect"
-msgstr "알림이 올바르지 않습니다"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "%(p)s 프로젝트의 %(u)s 사용자에 대한 알람 할당량 초과"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"%(meter_name)s이(가) %(comparison_operator)s %(statistic)s %(threshold)s인 경"
-"우 알람(%(period)s초 동안)"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "이름=%s인 알람이 있음"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "이름='%s'인 알람이 존재함"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "알람 %(alarm_ids)s이(가) 알 수 없는 상태임"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr "'%s' 표현식에서 산술 변환기는 하나 이상의 미터를 사용해야 함"
 
@@ -92,14 +39,6 @@ msgid "Cannot create table %(table_name)s   it already exists. Ignoring error"
 msgstr "%(table_name)s 테이블을 작성할 수 없음, 이미 존재합니다. 오류 무시"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "조합 규칙에 %s 알람 자체를 지정할 수 없음"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "알람 %s의 결합된 상태"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "%(name)s에서 오류 후 계속: %(error)s"
 
@@ -150,14 +89,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "HTTP 응답 구문 분석 중 오류 발생: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "알람 게시 중 오류 발생: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "알람 설정 중 오류 발생: %s"
-
 msgid "Event"
 msgstr "이벤트"
 
@@ -165,10 +96,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "표현식이 NaN 값으로 평가되었습니다!"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "알람 %s 평가 실패"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "%(name)s 확장자를 가져오는 데 실패함: %(error)s"
 
@@ -197,10 +124,6 @@ msgstr ""
 "보를 가져올 수 없습니다."
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "%s에 대한 디스패처 로드 실패"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "%s의 알림 핸들러 로드 실패"
 
@@ -237,14 +160,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "풀 %(pool_id)s 무시 중: %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"다음에서 이벤트 정의 파일 %(file)s의 올바르지 않은 YAML 구문: 행: %(line)s, "
-"열: %(column)s"
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "올바르지 않은 기간 %(period)s: %(err)s"
 
@@ -266,10 +181,6 @@ msgstr "여러 VM %s을(를) XenServer에서 찾음 "
 msgid "Must specify connection_url, and connection_password to use"
 msgstr "사용할 connection_url 및 connection_password를 지정해야 함 "
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "특성 %(trait)s에 대해 이름이 %(plugin)s인 사용 가능한 플러그인이 없음"
-
 msgid "Node Manager init failed"
 msgstr "노드 관리자 초기화 실패"
 
@@ -289,12 +200,6 @@ msgstr "Opencontrail API가 %(status)s 리턴: %(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "Order-by 표현식이 올바르지 않음: %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"%(trait)s에 대한 JSONPath 스펙 '%(jsonpath)s'의 구문 분석 오류: %(err)s"
-
 msgid "Period must be positive."
 msgstr "기간은 양수여야 합니다. "
 
@@ -313,18 +218,10 @@ msgid ""
 msgstr "파이프라인 %(pipeline)s: %(smp)s의 변환기 %(trans)s에서 오류 후 종료"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr "플러그인이 지정되었으나 특성 %s에 대해 플러그인 이름이 제공되지 않음"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "폴링 %(mtr)s 센서가 %(cnt)s번 실패했습니다!"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "폴링 %(name)s이(가) %(cnt)s번 실패했습니다!"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "%s의 의견조사자가 사용 안함으로 설정되어 있습니다!"
 
@@ -346,19 +243,6 @@ msgstr "공개 정책을 알 수 없음(%s). 기본값으로 강제 설정함"
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "RGW AdminOps API가 %(status)s %(reason)s을(를) 리턴함"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"%(count)d개 샘플의 %(disposition)s(으)로 인해 %(state)s(으)로 남아 있음 임계"
-"값, 가장 최근: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"상태 %(state)s에 있는 알람 %(alarm_ids)s(으)로 인해 %(state)s(으)로 남음"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "요청이 NorthBound REST API로 OpenDaylight에 연결하는 데 실패함"
 
@@ -366,10 +250,6 @@ msgstr "요청이 NorthBound REST API로 OpenDaylight에 연결하는 데 실패
 msgid "Required field %s not specified"
 msgstr "필수 필드 %s이(가) 지정되지 않음"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "특성 정의에서 필요한 필드가 지정되지 않음: '%s'"
-
 msgid "Resource"
 msgstr "리소스"
 
@@ -395,26 +275,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "파일 공개자의 경로가 필요함"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr "시간 제한조건 이름은 지정된 알람에 고유해야 합니다."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "시간대 %s이(가) 올바르지 않음"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"%(count)d개 샘플의 %(disposition)s(으)로 인해 %(state)s(으)로 전환되었습니"
-"다. 임계값, 가장 최근: %(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"상태 %(state)s에 있는 알람 %(alarm_ids)s(으)로 인해 %(state)s(으)로 상태 전이"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr " UDP: %s이(가) 보낸 데이터를 해독할 수 없습니다"
@@ -447,24 +307,6 @@ msgstr "공개자 %s을(를) 로드할 수 없음"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "하이퍼바이저 검사기를 로드할 수 없음: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "XenAPI에 로그인할 수 없음(Dom0 디스크가 가득 찼습니까?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "%s 알람에 대한 알림을 전송할 수 없습니다. "
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "조치없이 알람을 전송할 수 없습니다. "
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "%(alarm_id)s에 대한 %(action)s 조치를 구문 분석할 수 없습니다. "
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "%s 조치를 구문 분석할 수 없음"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -505,11 +347,6 @@ msgstr ""
 "fw %(id)s에서 알 수 없는 상태 %(stat)s이(가) 수신됨. 샘플을 건너뛰는 중"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr ""
-"멤버 %(id)s에서 알 수 없는 상태 %(stat)s이(가) 수신됨. 샘플을 건너뛰는 중"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 "풀 %(id)s에서 알 수 없는 상태 %(stat)s이(가) 수신됨. 샘플을 건너뛰는 중"
@@ -520,15 +357,6 @@ msgstr ""
 "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이(가) 수신됨. 샘플을 건너뛰는 중"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "지원되지 않는 조치 %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "VM %s을(를) XenServer에서 찾을 수 없음 "
 
@@ -543,26 +371,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI가 설치되지 않음"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "이벤트 정의 파일 %(file)s을(를) 읽는 중에 YAML 오류 발생"
-
-msgid "alarm evaluation cycle failed"
-msgstr "알람 평가 주기 실패"
-
-msgid "alarm retrieval failed"
-msgstr "알림 전송에 실패했습니다"
-
-msgid "alarm state update failed"
-msgstr "알람 상태 업데이트에 실패했습니다. "
-
-msgid "alarm stats retrieval failed"
-msgstr "알람 통계 검색에 실패했습니다. "
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "알람 상태 검색 실패: %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "%(id)s의 CPU 시간을 가져올 수 없음: %(e)s"
 
@@ -589,12 +397,3 @@ msgstr "IPMI 센서 데이터 구문 분석에 실패했음, 알 수 없는 센�
 
 msgid "running ipmitool failure"
 msgstr "ipmitool 실행 실패"
-
-msgid "state invalid"
-msgstr "상태가 잘못되었습니다"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp는 Datetime 오브젝트여야 함"
-
-msgid "timestamp should be datetime object"
-msgstr "시간소인은 Datetime 오브젝트여야 함"
diff --git a/ceilometer/locale/pt_BR/LC_MESSAGES/ceilometer.po b/ceilometer/locale/pt_BR/LC_MESSAGES/ceilometer.po
index 71c73598..1be7889f 100644
--- a/ceilometer/locale/pt_BR/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/pt_BR/LC_MESSAGES/ceilometer.po
@@ -1,90 +1,34 @@
-# Portuguese (Brazil) translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
 # Translators:
 # Gabriel Wainer, 2013
+# Gabriel Wainer, 2013
 # Andreas Jaeger <jaegerandi@gmail.com>, 2015. #zanata
 # Lucas Palm <lapalm@us.ibm.com>, 2015. #zanata
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-22 11:03+0000\n"
 "Last-Translator: Andreas Jaeger <jaegerandi@gmail.com>\n"
-"Language: pt_BR\n"
+"Language: pt-BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: Portuguese (Brazil)\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s Não Encontrada"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "%(rule)s deve ser definido para alarme de tipo %(type)s"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s e %(rule2)s não podem ser configurados ao mesmo tempo"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d datapoints são desconhecidos"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"Ação %(scheme)s para alarme %(alarm_id)s é desconhecida, não é possível "
-"notificar"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "Alarme%(alarm_id)s não localizado no projeto%(project)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "Alarme %s não localizado"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"A regra de combinação de alarme deve conter pelo menos dois ids de alarme "
-"diferentes."
-
-msgid "Alarm incorrect"
-msgstr "Alarme incorreto"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "Cota de alarme excedida para usuário %(u)s no projeto %(p)s"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"Alarma quando %(meter_name)s é %(comparison_operator)s que %(statistic)s de "
-"%(threshold)s durante %(period)s segundos"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "Alarme com o name=%s existe"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "Alarme com o name='%s' existe"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "Alarmes %(alarm_ids)s estão em um estado desconhecido"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr ""
 "O transformador aritmético deve usar pelo menos um medidor na expressão '%s'"
@@ -95,14 +39,6 @@ msgstr ""
 "Não é possível criar a tabela %(table_name)s; ela já existe. Ignorando erro"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "Não é possível especificar o próprio alarme %s na regra de combinação"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Estado combinado de alarmes %s"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Continuar após erro de %(name)s: %(error)s"
 
@@ -153,14 +89,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "Erro ao analisar a resposta de HTTP: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "Erro ao postar alarme: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "Erro ao colocar o alarme: %s"
-
 msgid "Event"
 msgstr "Evento"
 
@@ -168,10 +96,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "Expressão avaliada para um valor NaN!"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "Falha ao avaliar alarme %s"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "Falha ao importar extensão para %(name)s: %(error)s"
 
@@ -200,10 +124,6 @@ msgstr ""
 "%(id)s>, não é possível obter informações a partir de libvirt."
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "Falha ao carregar quaisquer dispatchers para %s"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "Falha ao carregar qualquer manipulador de notificações para %s"
 
@@ -240,14 +160,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Ignorando conjunto%(pool_id)s:%(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"Sintaxe YAML inválida no arquivo de definições de evento %(file)s na linha: "
-"%(line)s, coluna: %(column)s."
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "Período inválido %(period)s: %(err)s"
 
@@ -270,10 +182,6 @@ msgstr "Várias máquinas virtuais %s localizadas no XenServer"
 msgid "Must specify connection_url, and connection_password to use"
 msgstr "connection_url e connection_password devem ser especificados para uso"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "Nenhum plug-in nomeado %(plugin)s disponível para traço %(trait)s"
-
 msgid "Node Manager init failed"
 msgstr "Inicialização do gerenciador de nó com falha"
 
@@ -293,13 +201,6 @@ msgstr "A API Opencontrail retornou%(status)s%(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "Expressão solicitada inválida: %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"Erro de análise na especificação JSONPath '%(jsonpath)s' para %(trait)s: "
-"%(err)s"
-
 msgid "Period must be positive."
 msgstr "Período deve ser positivo."
 
@@ -319,19 +220,10 @@ msgstr ""
 "Pipeline %(pipeline)s: Saia após erro do transformador %(trans)s para %(smp)s"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr ""
-"Plug-in especificado, mas nenhum nome de plug-in fornecido para traço %s"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "O sensor de pesquisa %(mtr)s falhou para %(cnt)s vezes!"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "A pesquisa %(name)s falhou para %(cnt)s vezes!"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "O pesquisador para %s está desativado!"
 
@@ -355,20 +247,6 @@ msgstr "Publicando política desconhecida (%s) força para o padrão"
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "A API AdminOps RGW retornou %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Permanecendo como %(state)s devido a %(count)d amostras %(disposition)s "
-"limite, mais recente: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Permanecendo como %(state)s devido a alarmes %(alarm_ids)s no estado "
-"%(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "O pedido falhou ao conectar-se ao OpenDaylight com API REST NorthBound"
 
@@ -376,10 +254,6 @@ msgstr "O pedido falhou ao conectar-se ao OpenDaylight com API REST NorthBound"
 msgid "Required field %s not specified"
 msgstr "Campo obrigatório %s não especificado"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "Campo obrigatório na definição de traço não especificado: '%s'"
-
 msgid "Resource"
 msgstr "Recurso"
 
@@ -405,27 +279,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "O caminho para o publicador do arquivo é necessário"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr ""
-"Nomes de restrição de tempo devem ser exclusivos para um determinado alarme."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "Fuso horário %s não é válido"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Transição para %(state)s devido a %(count)d amostras %(disposition)s limite, "
-"mais recente: %(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Transição para %(state)s devido a alarmes %(alarm_ids)s no estado %(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: Não pode decodificar dados enviados por %s"
@@ -460,24 +313,6 @@ msgstr "Impossível carregar publicador %s"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Impossível carregar o inspetor do hypervisor: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "Não foi possível efetuar login no XenAPI (o disco Dom0 está cheio?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "Não é possível notificar alarme %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "Não é possível notificar um alarme sem ações"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "Não é possível avaliar a ação %(action)s para o alarme %(alarm_id)s"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "Não é possível analisar ação %s"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -519,11 +354,6 @@ msgstr ""
 "a amostra"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr ""
-"Status desconhecido %(stat)s recebido no membro %(id)s, ignorando a amostra"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 "Status desconhecido %(stat)s recebido no conjunto %(id)s, ignorando amostras"
@@ -534,16 +364,6 @@ msgstr ""
 "Status desconhecido %(stat)s recebido em vip %(id)s, ignorando a amostra"
 
 #, python-format
-msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
-msgstr ""
-"Status desconhecido %(stat)s recebido na rede privada virtual %(id)s, "
-"ignorando a amostra"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "Ação não suportada %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "Máquina virtual %s não localizada no XenServer"
 
@@ -558,26 +378,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI não instalado"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "Erro YAML ao ler o arquivo de definições de evento %(file)s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "ciclo de avaliação de alarme falhou"
-
-msgid "alarm retrieval failed"
-msgstr "obtenção de alarme falhou"
-
-msgid "alarm state update failed"
-msgstr "atualização do estado de alarme falhou"
-
-msgid "alarm stats retrieval failed"
-msgstr "recuperação das estatísticas de alarme falhou"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "a recuperação de estatísticas de alarme falhou: %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "não pôde obter o tempo de CPU para %(id)s: %(e)s"
 
@@ -605,12 +405,3 @@ msgstr "análise dos dados do sensor IPMI com falha,tipo de sensor desconhecido"
 
 msgid "running ipmitool failure"
 msgstr "executando falha de ipmitool"
-
-msgid "state invalid"
-msgstr "estado inválido"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp precisa ser objeto de data/hora"
-
-msgid "timestamp should be datetime object"
-msgstr "registro de data e hora precisa ser objeto de data/hora"
diff --git a/ceilometer/locale/ru/LC_MESSAGES/ceilometer.po b/ceilometer/locale/ru/LC_MESSAGES/ceilometer.po
index 3a659573..1933da9a 100644
--- a/ceilometer/locale/ru/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/ru/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# Russian translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -7,85 +7,27 @@
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language: ru\n"
-"Language-Team: Russian\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
+"Language-Team: Russian\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s не найден"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "Необходимо задать %(rule)s для предупреждения типа %(type)s"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s и %(rule2)s нельзя задавать одновременно"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "Неизвестные точки данных %d"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr ""
-"Неизвестное действие %(scheme)s для предупреждения %(alarm_id)s, уведомление "
-"невозможно"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "Предупреждение %(alarm_id)s не найдено в проекте %(project)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "Предупреждение %s не найдено"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-"Правило сочетания предупреждений должно содержать по крайней мере два "
-"различных ИД предупреждений."
-
-msgid "Alarm incorrect"
-msgstr "Некорректное предупреждение"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr ""
-"Квота на предупреждение превышена для пользователя %(u)s в проекте %(p)s"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"Предупреждение, когда %(meter_name)s %(comparison_operator)s %(statistic)s "
-"%(threshold)s за %(period)s с"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "Предупреждение с именем %s существует"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "Предупреждение с именем %s существует"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "Предупреждения %(alarm_ids)s находятся в неизвестном состоянии"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr ""
 "Арифметический преобразователь должен использовать хотя бы один счетчик в "
@@ -98,14 +40,6 @@ msgstr ""
 "ошибки"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "Указать само предупреждение %s в правиле сочетания невозможно"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Объединенное состояние предупреждений %s"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Продолжить после ошибки с %(name)s: %(error)s"
 
@@ -159,14 +93,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "Ошибка анализа ответа HTTP: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "Ошибка публикации предупреждения: %s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "Ошибка установки предупреждения: %s"
-
 msgid "Event"
 msgstr "Событие"
 
@@ -174,10 +100,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "Результат вычисления выражения - значение NaN!"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "Не удалось вычислить предупреждение %s"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "Не удалось импортировать расширение для %(name)s: %(error)s"
 
@@ -206,10 +128,6 @@ msgstr ""
 "%(id)s>, не удалось получить информацию от libvirt."
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "Не удалось загрузить диспетчеры для %s"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "Не удалось загрузить обработчики уведомлений для %s"
 
@@ -246,14 +164,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Пул %(pool_id)s игнорируется: %(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr ""
-"Недопустимый синтаксис YAML в файле определений событий %(file)s; строка: "
-"%(line)s, столбец: %(column)s."
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "Недопустимый интервал %(period)s: %(err)s"
 
@@ -275,10 +185,6 @@ msgstr "Найдено несколько виртуальных машин %s �
 msgid "Must specify connection_url, and connection_password to use"
 msgstr "Необходимо указать connection_url и connection_password"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "Нет модуля %(plugin)s для особенности %(trait)s"
-
 msgid "Node Manager init failed"
 msgstr "Сбой инициализации администратора узлов"
 
@@ -298,12 +204,6 @@ msgstr "API Opencontrail возвратил %(status)s %(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "Недопустимое выражение сортировки: %s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr ""
-"Ошибка анализа спецификации JSONPath %(jsonpath)s для %(trait)s: %(err)s"
-
 msgid "Period must be positive."
 msgstr "Период должен быть положительным."
 
@@ -324,18 +224,10 @@ msgstr ""
 "%(smp)s"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr "Указан модуль, но не передано имя модуля для особенности %s"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "%(cnt)s-кратный сбой датчика опроса %(mtr)s!"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "Опрос %(name)s не удалось выполнить %(cnt)s раз!"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "Опрашивающий объект для %s выключен!"
 
@@ -360,20 +252,6 @@ msgstr "Стратегия публикации неизвестна (%s). По
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "Функция API RGW AdminOps вернула %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Сохранение состояния %(state)s из-за %(count)d образцов, порог "
-"%(disposition)s, последнее значение: %(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Сохранение состояния %(state)s из-за предупреждений %(alarm_ids)s в "
-"состоянии %(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "Сбой запроса на подключение к OpenDaylight с API REST NorthBound"
 
@@ -381,10 +259,6 @@ msgstr "Сбой запроса на подключение к OpenDaylight с A
 msgid "Required field %s not specified"
 msgstr "Не указано обязательное поле %s"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "Не указано обязательное поле в определении особенности: %s"
-
 msgid "Resource"
 msgstr "Ресурс"
 
@@ -410,29 +284,6 @@ msgstr ""
 msgid "The path for the file publisher is required"
 msgstr "Требуется путь для публикатора файлов"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr ""
-"Имена ограничений времени должны быть уникальными для заданного "
-"предупреждения."
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "Часовой пояс %s недопустимый"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"Переход в %(state)s из-за %(count)d образцов, порог %(disposition)s, "
-"последнее значение: %(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr ""
-"Переход в состояние %(state)s из-за предупреждений %(alarm_ids)s в состоянии "
-"%(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: не удается декодировать данные, отправленные %s"
@@ -466,27 +317,6 @@ msgstr "Не удалось загрузить публикатор %s"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Не удалось загрузить инспектор гипервизора: %s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr ""
-"Невозможно выполнить вход в XenAPI (недостаточно свободного места на Dom0?)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "Не удалось уведомить о предупреждении %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "Не удалось уведомить о предупреждении без действия"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr ""
-"Не удалось проанализировать действие %(action)s для предупреждения "
-"%(alarm_id)s"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "Ошибка анализа действия %s"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -527,11 +357,6 @@ msgstr ""
 "В fw %(id)s получено неизвестное состояние %(stat)s,пример пропускается"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr ""
-"В элементе %(id)s получено неизвестное состояние %(stat)s,пример пропускается"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 "В пуле %(id)s получено неизвестное состояние %(stat)s,пример пропускается"
@@ -542,15 +367,6 @@ msgstr ""
 "В 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,пример пропускается"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "Неподдерживаемое действие %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "Не найдена виртуальная машина %s в XenServer"
 
@@ -565,26 +381,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI не установлен"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "Ошибка YAML при чтении файла определений событий %(file)s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "сбой цикла вычисления предупреждения"
-
-msgid "alarm retrieval failed"
-msgstr "не удалось получить предупреждение"
-
-msgid "alarm state update failed"
-msgstr "Обновление состояния предупреждений не выполнено"
-
-msgid "alarm stats retrieval failed"
-msgstr "Возвращение статистики предупреждения не выполнено"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "не удалось получить статистику предупреждений: %s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "не удалось получить процессорное время для %(id)s: %(e)s"
 
@@ -611,12 +407,3 @@ msgstr "сбой анализа данных датчика IPMI, неизвес
 
 msgid "running ipmitool failure"
 msgstr "сбой выполнения ipmitool"
-
-msgid "state invalid"
-msgstr "недопустимое состояние"
-
-msgid "state_timestamp should be datetime object"
-msgstr "Параметр state_timestamp должен быть объектом datetime"
-
-msgid "timestamp should be datetime object"
-msgstr "Системное время должно быть объектом datetime"
diff --git a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
index f0100e25..91dd339d 100644
--- a/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# Chinese (Simplified, China) translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -7,87 +7,33 @@
 # yelu <yelu@unitedstack.com>, 2013
 # Tom Fifield <tom@openstack.org>, 2013
 # 颜海峰 <yanheven@gmail.com>, 2014
+# yelu <yelu@unitedstack.com>, 2013
+# Yu Zhang, 2013
 # Yu Zhang, 2013
+# 颜海峰 <yanheven@gmail.com>, 2014
 # Lucas Palm <lapalm@us.ibm.com>, 2015. #zanata
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language: zh_Hans_CN\n"
+"Language: zh-CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: Chinese (China)\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "无法找到%(entity)s %(id)s "
 
 #, python-format
-msgid "%(name)s count exceeds maximum value %(maximum)d"
-msgstr "%(name)s数量超过最大值%(maximum)d"
-
-#, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "类型为%(type)s的告警必须设置%(rule)s"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "%(rule1)s和%(rule2)s无法同时被设置"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d 数据点为未知"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr "警报 %(alarm_id)s 的动作 %(scheme)s 未知，无法通知"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "告警%(alarm_id)s在项目%(project)s中未找到"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "告警%s没有找到"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr "告警组合规则必须包含至少两个不同的告警id"
-
-msgid "Alarm incorrect"
-msgstr "警报不正确"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "用户%(u)s在项目%(p)s中的告警配额已溢出"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"请在 %(meter_name)s 是 %(comparison_operator)s（%(threshold)s 的 "
-"%(statistic)s）的时间超过 %(period)s 秒时发出警报"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "名称为%s的告警已存在"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "名称为'%s'的告警已经存在"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "告警%(alarm_ids)s处于未知的状态"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr "算术变形器在表达式'%s'中必须至少使用一个指标"
 
@@ -96,14 +42,6 @@ msgid "Cannot create table %(table_name)s   it already exists. Ignoring error"
 msgstr "表%(table_name)s已经存在，无法创建。忽略此错误继续执行。"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "无法在组合规则中指定告警%s自身"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "将告警%s的状态进行组合"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "遇到错误%(name)s：%(error)s，继续执行"
 
@@ -152,14 +90,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "解析HTTP响应失败: %s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "创建告警%s时遇到错误"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "修改告警%s时遇到错误"
-
 msgid "Event"
 msgstr "事件"
 
@@ -167,10 +97,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "表达式计算结果为NaN！"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "评估告警%s时失败了"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "无法为%(name)s引入扩展：%(error)s"
 
@@ -198,10 +124,6 @@ msgstr ""
 "息。"
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "无法为%s加载任何分发器"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "无法为%s加载任何通知处理器"
 
@@ -238,12 +160,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "忽略pool %(pool_id)s：%(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr "事件定义文件%(file)s中有非法YAML语法，行：%(line)s，列%(column)s。"
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "非法的间隔%(period)s: %(err)s"
 
@@ -265,10 +181,6 @@ msgstr "多个虚拟机%s在XenServer中被找到"
 msgid "Must specify connection_url, and connection_password to use"
 msgstr "使用时必须指定connection_url和connection_password"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "特征%(trait)s缺少可用的名为%(plugin)s的插件"
-
 msgid "Node Manager init failed"
 msgstr "节点管理器初始化失败"
 
@@ -288,11 +200,6 @@ msgstr "Opencontrail接口返回状态%(status)s，原因%(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "orderby表达式不合法：%s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr "%(trait)s 的 JSONPath 规范“%(jsonpath)s”中存在解析错误：%(err)s"
-
 msgid "Period must be positive."
 msgstr "period 参数必须是正数"
 
@@ -311,18 +218,10 @@ msgid ""
 msgstr "流水线%(pipeline)s：数据%(smp)s的变形器%(trans)s遇到错误，退出"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr "特征%s指定了插件但是没有提供插件的名称"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "拉取%(mtr)s传感器失败了%(cnt)s次！"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "拉取%(name)s失败了%(cnt)s次！"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "%s的采集器被禁用"
 
@@ -343,18 +242,6 @@ msgstr "未知的发布策略(%s)，强制使用默认策略"
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "RGW AdminOps接口返回%(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"有%(count)d个数据满足%(disposition)s阈值，因而状态保持为%(state)s，最近的一次"
-"数据：%(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr "停留在状态%(state)s因为告警%(alarm_ids)s处于状态%(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "请求无法连接到OpenDaylight的北向REST接口"
 
@@ -362,10 +249,6 @@ msgstr "请求无法连接到OpenDaylight的北向REST接口"
 msgid "Required field %s not specified"
 msgstr "必填项%s没有填写"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "在特征定义中的必填项没有填写：'%s'"
-
 msgid "Resource"
 msgstr "资源"
 
@@ -389,25 +272,6 @@ msgstr "数据类型%(type)s不被支持。支持的数据类型列表：%(suppo
 msgid "The path for the file publisher is required"
 msgstr "文件发布器必须设置文件路径"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr "一个指定的告警的时间约束名称必须唯一"
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "时区%s不合法"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"有%(count)d个数据满足%(disposition)s阈值，因而状态迁移到%(state)s，最近的一次"
-"数据：%(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr "迁移到状态%(state)s，因为告警%(alarm_ids)s处于状态%(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP: 无法解码由 %s 发送的数据"
@@ -440,24 +304,6 @@ msgstr "无法加载发布器%s"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "无法加载管理程序的探测器：%s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "无法通知警报 %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "无法为一个没有动作的警报进行通知"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "无法为警报 %(alarm_id)s 解析动作 %(action)s "
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "无法解析动作%s"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -492,10 +338,6 @@ msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr "从fw %(id)s收到未知的状态%(stat)s，跳过该采样数据"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr "从member %(id)s收到未知的状态%(stat)s，跳过该采样数据"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr "从pool %(id)s收到未知的状态%(stat)s，跳过该采样数据"
 
@@ -504,14 +346,6 @@ msgid "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 msgstr "从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，跳过该采样数据"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "动作%s不支持"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "无法在XenServer中找到虚拟机%s"
 
@@ -526,30 +360,6 @@ msgid "XenAPI not installed"
 msgstr "XenAPI没有安装"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "读取事件定义文件%(file)s时遇到YAML错误"
-
-#, python-format
-msgid "You are not authorized to create action: %s"
-msgstr "你没有权限创建动作：%s"
-
-msgid "alarm evaluation cycle failed"
-msgstr "警报周期评估失败"
-
-msgid "alarm retrieval failed"
-msgstr "获取警报失败"
-
-msgid "alarm state update failed"
-msgstr "警报状态更新失败"
-
-msgid "alarm stats retrieval failed"
-msgstr "警报统计信息获取失败"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "告警状态检索失败：%s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "无法为虚拟机%(id)s获取CPU时间：%(e)s"
 
@@ -575,12 +385,3 @@ msgstr "解析IPMI传感器数据失败，未知的传感器类型"
 
 msgid "running ipmitool failure"
 msgstr "运行ipmitool时失败了"
-
-msgid "state invalid"
-msgstr "状态无效"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp必须是datetime对象"
-
-msgid "timestamp should be datetime object"
-msgstr "timestamp必须是datatime对象"
diff --git a/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po b/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po
index e9c1fe1f..dc0d54de 100644
--- a/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/zh_TW/LC_MESSAGES/ceilometer.po
@@ -1,4 +1,4 @@
-# Chinese (Traditional, Taiwan) translations for ceilometer.
+# Translations template for ceilometer.
 # Copyright (C) 2015 ORGANIZATION
 # This file is distributed under the same license as the ceilometer project.
 #
@@ -8,78 +8,25 @@
 # OpenStack Infra <zanata@openstack.org>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 6.0.0.dev69\n"
+"Project-Id-Version: ceilometer 6.0.0.0b3.dev4\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-10-22 06:14+0000\n"
+"POT-Creation-Date: 2016-01-22 05:03+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "PO-Revision-Date: 2015-09-04 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
-"Language: zh_Hant_TW\n"
+"Language: zh-TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Generated-By: Babel 2.0\n"
+"X-Generator: Zanata 3.7.3\n"
 "Language-Team: Chinese (Taiwan)\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.1.1\n"
 
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "找不到 %(entity)s %(id)s"
 
 #, python-format
-msgid "%(rule)s must be set for %(type)s type alarm"
-msgstr "必須為 %(type)s 類型警示設定 %(rule)s"
-
-#, python-format
-msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
-msgstr "無法同時設定 %(rule1)s 和 %(rule2)s"
-
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d 個資料點不明"
-
-#, python-format
-msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
-msgstr "警示 %(alarm_id)s 的動作 %(scheme)s 不明，無法通知"
-
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "在專案 %(project)s 中找不到警示 %(alarm_id)s"
-
-#, python-format
-msgid "Alarm %s not found"
-msgstr "找不到警示 %s"
-
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr "警示組合規則應該至少包含兩個不同的警示 ID。"
-
-msgid "Alarm incorrect"
-msgstr "警示不正確"
-
-#, python-format
-msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
-msgstr "在專案 %(p)s 上，針對使用者 %(u)s 已超出的警示配額"
-
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-"如果 %(meter_name)s 在 %(period)s 秒內 %(comparison_operator)s %(threshold)s "
-"的%(statistic)s，則會出現警示"
-
-#, python-format
-msgid "Alarm with name=%s exists"
-msgstr "名稱為 %s 的警示已存在"
-
-#, python-format
-msgid "Alarm with name='%s' exists"
-msgstr "名稱為 '%s' 的警示已存在"
-
-#, python-format
-msgid "Alarms %(alarm_ids)s are in unknown state"
-msgstr "警示 %(alarm_ids)s 處於不明狀態"
-
-#, python-format
 msgid "Arithmetic transformer must use at least one meter in expression '%s'"
 msgstr "在表示式 '%s' 中，算術轉換器必須至少使用一種計量"
 
@@ -88,14 +35,6 @@ msgid "Cannot create table %(table_name)s   it already exists. Ignoring error"
 msgstr "無法建立表格 %(table_name)s，該表格已經存在。將忽略錯誤"
 
 #, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "無法在組合規則中指定警示 %s 本身"
-
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "警示 %s 的合併狀態"
-
-#, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "在 %(name)s 傳回錯誤 %(error)s 後繼續"
 
@@ -144,14 +83,6 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr "剖析 HTTP 回應時發生錯誤：%s"
 
-#, python-format
-msgid "Error while posting alarm: %s"
-msgstr "公佈警示時發生錯誤：%s"
-
-#, python-format
-msgid "Error while putting alarm: %s"
-msgstr "放置警示時發生錯誤：%s"
-
 msgid "Event"
 msgstr "事件"
 
@@ -159,10 +90,6 @@ msgid "Expression evaluated to a NaN value!"
 msgstr "表示式已求值為非數字值！"
 
 #, python-format
-msgid "Failed to evaluate alarm %s"
-msgstr "無法評估警示 %s"
-
-#, python-format
 msgid "Failed to import extension for %(name)s: %(error)s"
 msgstr "無法匯入 %(name)s 的延伸：%(error)s"
 
@@ -188,10 +115,6 @@ msgstr ""
 "訊。"
 
 #, python-format
-msgid "Failed to load any dispatchers for %s"
-msgstr "無法載入 %s 的任何分派器"
-
-#, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "無法載入 %s 的任何通知處理程式"
 
@@ -228,12 +151,6 @@ msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "正在忽略儲存區 %(pool_id)s：%(error)s"
 
 #, python-format
-msgid ""
-"Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s, "
-"column: %(column)s."
-msgstr "事件定義檔 %(file)s 第 %(line)s 行第 %(column)s 欄的 YAML 語法無效。"
-
-#, python-format
 msgid "Invalid period %(period)s: %(err)s"
 msgstr "期間 %(period)s 無效：%(err)s"
 
@@ -255,10 +172,6 @@ msgstr "在 XenServer 中找到多個 VM %s"
 msgid "Must specify connection_url, and connection_password to use"
 msgstr "必須指定 connection_url 和 connection_password，才能使用"
 
-#, python-format
-msgid "No plugin named %(plugin)s available for trait %(trait)s"
-msgstr "特徵 %(trait)s 無法使用任何名稱為 %(plugin)s 的外掛程式 "
-
 msgid "Node Manager init failed"
 msgstr "節點管理程式起始設定失敗"
 
@@ -278,11 +191,6 @@ msgstr "Opencontrail API 傳回了 %(status)s %(reason)s"
 msgid "Order-by expression not valid: %s"
 msgstr "排序方式表示式無效：%s"
 
-#, python-format
-msgid ""
-"Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: %(err)s"
-msgstr "%(trait)s 的 JSONPath 規格 '%(jsonpath)s' 發生剖析錯誤：%(err)s"
-
 msgid "Period must be positive."
 msgstr "期間必須是正數。"
 
@@ -301,18 +209,10 @@ msgid ""
 msgstr "管線 %(pipeline)s：%(smp)s 的轉換器 %(trans)s傳回錯誤後結束"
 
 #, python-format
-msgid "Plugin specified, but no plugin name supplied for trait %s"
-msgstr "指定了外掛程式，但沒有提供任何外掛程式名稱給特徵 %s"
-
-#, python-format
 msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
 msgstr "輪詢 %(mtr)s 感應器已失敗 %(cnt)s 次！"
 
 #, python-format
-msgid "Polling %(name)s faild for %(cnt)s times!"
-msgstr "輪詢 %(name)s 已失敗 %(cnt)s 次！"
-
-#, python-format
 msgid "Pollster for %s is disabled!"
 msgstr "已停用 %s 的 Pollster！"
 
@@ -333,18 +233,6 @@ msgstr "發佈原則不明 (%s)，強制設為預設值"
 msgid "RGW AdminOps API returned %(status)s %(reason)s"
 msgstr "RGW AdminOps API 傳回了 %(status)s %(reason)s"
 
-#, python-format
-msgid ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"保持 %(state)s，因為有 %(count)d 個樣本 %(disposition)s 臨界值，最新："
-"%(most_recent)s"
-
-#, python-format
-msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr "保持 %(state)s，因為警示 %(alarm_ids)s 處於狀態 %(state)s"
-
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "要求無法使用 NorthBound REST API 來連接至 OpenDaylight"
 
@@ -352,10 +240,6 @@ msgstr "要求無法使用 NorthBound REST API 來連接至 OpenDaylight"
 msgid "Required field %s not specified"
 msgstr "未指定必要欄位 %s"
 
-#, python-format
-msgid "Required field in trait definition not specified: '%s'"
-msgstr "未指定特徵定義中的必要欄位：'%s'"
-
 msgid "Resource"
 msgstr "資源"
 
@@ -379,25 +263,6 @@ msgstr "不支援資料類型 %(type)s。支援的資料類型清單為：%(supp
 msgid "The path for the file publisher is required"
 msgstr "需要檔案發佈者的路徑"
 
-msgid "Time constraint names must be unique for a given alarm."
-msgstr "針對給定的警示，時間限制名稱必須是唯一的。"
-
-#, python-format
-msgid "Timezone %s is not valid"
-msgstr "時區 %s 無效"
-
-#, python-format
-msgid ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s threshold, "
-"most recent: %(most_recent)s"
-msgstr ""
-"轉移到 %(state)s，由於 %(count)d 個樣本 %(disposition)s 臨界值，最新："
-"%(most_recent)s"
-
-#, python-format
-msgid "Transition to %(state)s due to alarms %(alarm_ids)s in state %(state)s"
-msgstr "轉移至 %(state)s，因為警示 %(alarm_ids)s 處於狀態 %(state)s"
-
 #, python-format
 msgid "UDP: Cannot decode data sent by %s"
 msgstr "UDP：無法解碼由 %s 傳送的資料"
@@ -430,24 +295,6 @@ msgstr "無法載入發佈者 %s"
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "無法載入 Hypervisor 檢查程式：%s"
 
-msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr "無法登入 XenAPI（Dom0 磁碟已滿？）"
-
-#, python-format
-msgid "Unable to notify alarm %s"
-msgstr "無法通知警示 %s"
-
-msgid "Unable to notify for an alarm with no action"
-msgstr "在不使用任何動作的情況下，無法通知警示"
-
-#, python-format
-msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
-msgstr "無法剖析警示 %(alarm_id)s 的動作 %(action)s"
-
-#, python-format
-msgid "Unable to parse action %s"
-msgstr "無法剖析動作 %s"
-
 #, python-format
 msgid ""
 "Unable to reconnect to the primary mongodb after %(retries)d retries. Giving "
@@ -483,10 +330,6 @@ msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr "在防火牆 %(id)s 上接收到不明狀態 %(stat)s，正在跳過範例"
 
 #, python-format
-msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
-msgstr "在成員 %(id)s 上接收到不明狀態 %(stat)s，正在跳過範例"
-
-#, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr "在儲存區 %(id)s 上接收到不明狀態 %(stat)s，正在跳過範例"
 
@@ -495,14 +338,6 @@ msgid "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 msgstr "在 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，正在跳過範例"
-
-#, python-format
-msgid "Unsupported action %s"
-msgstr "不受支援的動作 %s"
-
-#, python-format
 msgid "VM %s not found in XenServer"
 msgstr "在 XenServer 中找不到 VM %s"
 
@@ -517,26 +352,6 @@ msgid "XenAPI not installed"
 msgstr "未安裝 XenAPI"
 
 #, python-format
-msgid "YAML error reading Event Definitions file %(file)s"
-msgstr "讀取事件定義檔 %(file)s 時發生 YAML 錯誤"
-
-msgid "alarm evaluation cycle failed"
-msgstr "警示評估週期失敗"
-
-msgid "alarm retrieval failed"
-msgstr "警示擷取失敗"
-
-msgid "alarm state update failed"
-msgstr "警示狀態更新失敗"
-
-msgid "alarm stats retrieval failed"
-msgstr "警示統計資料擷取失敗"
-
-#, python-format
-msgid "alarm stats retrieval failed: %s"
-msgstr "警示統計資料擷取失敗：%s"
-
-#, python-format
 msgid "could not get CPU time for %(id)s: %(e)s"
 msgstr "無法取得 %(id)s 的 CPU 時間：%(e)s"
 
@@ -562,12 +377,3 @@ msgstr "剖析 IPMI 感應器資料失敗，感應器類型不明"
 
 msgid "running ipmitool failure"
 msgstr "執行 ipmitool 失敗"
-
-msgid "state invalid"
-msgstr "狀態無效"
-
-msgid "state_timestamp should be datetime object"
-msgstr "state_timestamp 應該為日期時間物件"
-
-msgid "timestamp should be datetime object"
-msgstr "時間戳記應該為日期時間物件"