Imported Translations from Transifex

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

Change-Id: I34d044fac98ec0718be803bc6307820f9105b3ed

ceilometer/locale/ceilometer-log-error.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2015.1.dev2\n"
+"Project-Id-Version: ceilometer 2015.1.dev168\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+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"
@@ -22,20 +22,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -47,18 +47,22 @@ msgstr ""
 msgid "in dynamic looping call"
 msgstr ""
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr ""
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr ""
 
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""
+

ceilometer/locale/ceilometer-log-info.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2015.1.dev39\n"
+"Project-Id-Version: ceilometer 2015.1.dev168\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+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"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -36,16 +36,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr ""
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -98,3 +98,8 @@ msgstr ""
 msgid "Waiting on %d children to exit"
 msgstr ""
 
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""
+

ceilometer/locale/ceilometer-log-warning.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2015.1.dev2\n"
+"Project-Id-Version: ceilometer 2015.1.dev168\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
+#: ceilometer/notification.py:154
+msgid ""
+"Non-metric meters may be collected. It is highly advisable to disable "
+"these meters using ceilometer.conf or the pipeline.yaml"
+msgstr ""
+
 #: ceilometer/agent/discovery/endpoint.py:42
 #, python-format
 msgid "No endpoints found for service %s"
@@ -27,7 +33,14 @@ msgstr ""
 msgid "Expecting %(expected)d datapoints but only get %(actual)d"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:123
+#: ceilometer/api/app.py:84
+msgid ""
+"pecan_debug cannot be enabled, if workers is > 1, the value is overrided "
+"with False"
+msgstr ""
+
+#: ceilometer/compute/pollsters/disk.py:133
+#: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
@@ -53,3 +66,20 @@ msgstr ""
 msgid "pid %d not in child list"
 msgstr ""
 
+#: ceilometer/publisher/kafka_broker.py:88
+#, python-format
+msgid "Publishing policy is unknown (%s) force to default"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:149
+#, python-format
+msgid "Failed to publish %d datum"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:170
+#, python-format
+msgid ""
+"Kafka Publisher max local queue length is exceeded, dropping %d oldest "
+"data"
+msgstr ""
+

ceilometer/locale/ceilometer.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2015.1.dev39\n"
+"Project-Id-Version: ceilometer 2015.1.dev168\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+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"
@@ -31,17 +31,17 @@ msgstr ""
 msgid "UDP: Unable to store meter"
 msgstr ""
 
-#: ceilometer/notification.py:144 ceilometer/notifier.py:46
+#: ceilometer/notification.py:163 ceilometer/notifier.py:46
 #, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr ""
 
-#: ceilometer/notification.py:157
+#: ceilometer/notification.py:179
 #, python-format
 msgid "Event types from %(name)s: %(type)s (ack_on_error=%(error)s)"
 msgstr ""
 
-#: ceilometer/notification.py:191
+#: ceilometer/notification.py:213
 #, python-format
 msgid "Pipeline endpoint: %s"
 msgstr ""
@@ -51,59 +51,59 @@ msgstr ""
 msgid "loading notification handlers from %s"
 msgstr ""
 
-#: ceilometer/pipeline.py:311
+#: ceilometer/pipeline.py:312
 #, python-format
 msgid "Unable to load publisher %s"
 msgstr ""
 
-#: ceilometer/pipeline.py:329
+#: ceilometer/pipeline.py:330
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Setup transformer instance %(name)s with parameter"
 " %(param)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:348 ceilometer/pipeline.py:412
+#: ceilometer/pipeline.py:349 ceilometer/pipeline.py:413
 #, python-format
 msgid "Pipeline %(pipeline)s: Continue after error from publisher %(pub)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:367
+#: ceilometer/pipeline.py:368
 #, python-format
 msgid "Pipeline %(pipeline)s: Sample dropped by transformer %(trans)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:375
+#: ceilometer/pipeline.py:376
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
 "%(smp)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:398
+#: ceilometer/pipeline.py:399
 #, python-format
 msgid "Pipeline %(pipeline)s: Transform sample %(smp)s from %(trans)s transformer"
 msgstr ""
 
-#: ceilometer/pipeline.py:428
+#: ceilometer/pipeline.py:429
 #, python-format
 msgid "Pipeline %(pipeline)s: Error flushing transformer %(trans)s"
 msgstr ""
 
-#: ceilometer/pipeline.py:624
+#: ceilometer/pipeline.py:625
 msgid "detected decoupled pipeline config format"
 msgstr ""
 
-#: ceilometer/pipeline.py:645
+#: ceilometer/pipeline.py:646
 msgid "detected deprecated pipeline config format"
 msgstr ""
 
-#: ceilometer/pipeline.py:669
+#: ceilometer/pipeline.py:670
 #, python-format
 msgid "Pipeline config file: %s"
 msgstr ""
 
-#: ceilometer/pipeline.py:675
+#: ceilometer/pipeline.py:676
 #, python-format
 msgid "Pipeline config: %s"
 msgstr ""
@@ -113,27 +113,49 @@ msgstr ""
 msgid "%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
 msgstr ""
 
-#: ceilometer/agent/base.py:127
+#: ceilometer/agent/base.py:130
 #, python-format
 msgid "Polling pollster %(poll)s in the context of %(src)s"
 msgstr ""
 
-#: ceilometer/agent/base.py:140
+#: ceilometer/agent/base.py:161
+#, python-format
+msgid ""
+"Found following duplicated resoures for %(name)s in context of "
+"%(source)s:%(list)s. Check pipeline configuration."
+msgstr ""
+
+#: ceilometer/agent/base.py:172
 #, python-format
 msgid "Skip polling pollster %s, no resources found"
 msgstr ""
 
-#: ceilometer/agent/base.py:152
+#: ceilometer/agent/base.py:184
+#, python-format
+msgid "Prevent pollster %(name)s for polling source %(source)s anymore!"
+msgstr ""
+
+#: ceilometer/agent/base.py:190
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/agent/base.py:298
+#: ceilometer/agent/base.py:244
+#, python-format
+msgid "Skip loading extension for %s"
+msgstr ""
+
+#: ceilometer/agent/base.py:248
+#, python-format
+msgid "Failed to import extension for %(name)s: %(error)s"
+msgstr ""
+
+#: ceilometer/agent/base.py:357
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr ""
 
-#: ceilometer/agent/base.py:300
+#: ceilometer/agent/base.py:359
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr ""
@@ -238,16 +260,62 @@ msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
 msgstr ""
 
 #: ceilometer/alarm/evaluator/combination.py:99
+#: ceilometer/alarm/evaluator/gnocchi.py:207
 #: ceilometer/alarm/evaluator/threshold.py:178
 #, python-format
 msgid "Attempted to evaluate alarm %s, but it is not within its time constraint."
 msgstr ""
 
+#: ceilometer/alarm/evaluator/gnocchi.py:99
+#: ceilometer/alarm/evaluator/threshold.py:89
+#, python-format
+msgid "stats query %s"
+msgstr ""
+
+#: ceilometer/alarm/evaluator/gnocchi.py:103
+#: ceilometer/alarm/evaluator/threshold.py:95
+msgid "alarm stats retrieval failed"
+msgstr ""
+
+#: ceilometer/alarm/evaluator/gnocchi.py:106
+#, python-format
+msgid "alarm stats retrieval failed: %s"
+msgstr ""
+
+#: ceilometer/alarm/evaluator/gnocchi.py:121
 #: ceilometer/alarm/evaluator/threshold.py:56
 #, python-format
 msgid "query stats from %(start)s to %(now)s"
 msgstr ""
 
+#: ceilometer/alarm/evaluator/gnocchi.py:133
+#: ceilometer/alarm/evaluator/threshold.py:112
+#, python-format
+msgid "%d datapoints are unknown"
+msgstr ""
+
+#: ceilometer/alarm/evaluator/gnocchi.py:156
+#: 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:160
+#: 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/evaluator/gnocchi.py:219
+#: ceilometer/alarm/evaluator/threshold.py:197
+#, python-format
+msgid "comparing value %(value)s against threshold %(limit)s"
+msgstr ""
+
 #: ceilometer/alarm/evaluator/threshold.py:66
 #, python-format
 msgid "sanitize stats %s"
@@ -263,39 +331,6 @@ msgstr ""
 msgid "pruned statistics to %d"
 msgstr ""
 
-#: ceilometer/alarm/evaluator/threshold.py:89
-#, python-format
-msgid "stats query %s"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/threshold.py:95
-msgid "alarm stats retrieval failed"
-msgstr ""
-
-#: ceilometer/alarm/evaluator/threshold.py:112
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr ""
-
-#: 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/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/evaluator/threshold.py:197
-#, python-format
-msgid "comparing value %(value)s against threshold %(limit)s"
-msgstr ""
-
 #: ceilometer/alarm/notifier/log.py:30
 #, python-format
 msgid ""
@@ -460,21 +495,21 @@ msgstr ""
 msgid "state_timestamp should be datetime object"
 msgstr ""
 
-#: ceilometer/api/app.py:163
+#: ceilometer/api/app.py:136
 #, python-format
 msgid "Starting server in PID %s"
 msgstr ""
 
-#: ceilometer/api/app.py:164
+#: ceilometer/api/app.py:137
 msgid "Configuration:"
 msgstr ""
 
-#: ceilometer/api/app.py:168
+#: ceilometer/api/app.py:141
 #, 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:172
+#: ceilometer/api/app.py:145
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr ""
@@ -484,143 +519,122 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:80
+#: ceilometer/api/controllers/v2/alarms.py:84
-#, python-format
-msgid "Alarm %s not found"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:82
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)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:207
+#: ceilometer/api/controllers/v2/alarms.py:166
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:253
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:262
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:283
-#, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:333
 #, python-format
 msgid "Timezone %s is not valid"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:445
+#: ceilometer/api/controllers/v2/alarms.py:281
 msgid "Time constraint names must be unique for a given alarm."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:455
+#: ceilometer/api/controllers/v2/alarms.py:291
 #, python-format
 msgid "%(rule)s must be set for %(type)s type alarm"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:466
+#: ceilometer/api/controllers/v2/alarms.py:302
 #, python-format
 msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:483
+#: ceilometer/api/controllers/v2/alarms.py:319
 #, python-format
 msgid "Unable to parse action %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:486
+#: ceilometer/api/controllers/v2/alarms.py:322
 #, python-format
 msgid "Unsupported action %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:670
+#: ceilometer/api/controllers/v2/alarms.py:509
 #, python-format
 msgid "Alarm with name=%s exists"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:680
+#: ceilometer/api/controllers/v2/alarms.py:519
 #, python-format
 msgid "Error while putting alarm: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:681
+#: ceilometer/api/controllers/v2/alarms.py:520
-#: ceilometer/api/controllers/v2/alarms.py:849
+#: ceilometer/api/controllers/v2/alarms.py:688
 msgid "Alarm incorrect"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:741
+#: ceilometer/api/controllers/v2/alarms.py:580
 msgid "state invalid"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:842
+#: ceilometer/api/controllers/v2/alarms.py:681
 #, python-format
 msgid "Alarm with name='%s' exists"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:848
+#: ceilometer/api/controllers/v2/alarms.py:687
 #, python-format
 msgid "Error while posting alarm: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:48
+#: ceilometer/api/controllers/v2/base.py:50
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:57
+#: ceilometer/api/controllers/v2/base.py:59
 #, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:216
+#: ceilometer/api/controllers/v2/base.py:220
 #, python-format
 msgid "Unable to convert the value %(value)s to the expected data type %(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:221
+#: ceilometer/api/controllers/v2/base.py:225
 #, python-format
 msgid ""
 "The data type %(type)s is not supported. The supported data type list is:"
 " %(supported)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:226
+#: ceilometer/api/controllers/v2/base.py:230
 #, python-format
 msgid ""
 "Unexpected exception converting %(value)s to the expected data type "
 "%(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/events.py:168
+#: 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:172
 msgid "operator {} is incorrect"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/events.py:190
+#: ceilometer/api/controllers/v2/events.py:195
 #, python-format
 msgid "Getting traits for %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/events.py:260
+#: ceilometer/api/controllers/v2/events.py:266
 msgid "Event"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/events.py:263
+#: ceilometer/api/controllers/v2/events.py:269
 #, python-format
 msgid "More than one event with id %s returned from storage driver"
 msgstr ""
@@ -684,6 +698,27 @@ msgstr ""
 msgid "Sample"
 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/cmd/storage.py:39
 msgid "Clearing expired metering data"
 msgstr ""
@@ -717,10 +752,11 @@ msgstr ""
 
 #: ceilometer/compute/pollsters/cpu.py:48
 #: ceilometer/compute/pollsters/cpu.py:79
-#: ceilometer/compute/pollsters/disk.py:125
+#: ceilometer/compute/pollsters/disk.py:131
-#: ceilometer/compute/pollsters/disk.py:335
+#: ceilometer/compute/pollsters/disk.py:341
-#: ceilometer/compute/pollsters/disk.py:517
+#: ceilometer/compute/pollsters/disk.py:523
-#: ceilometer/compute/pollsters/disk.py:598
+#: ceilometer/compute/pollsters/disk.py:604
+#: ceilometer/compute/pollsters/disk.py:699
 #: ceilometer/compute/pollsters/memory.py:47
 #: ceilometer/compute/pollsters/net.py:106
 #, python-format
@@ -757,28 +793,34 @@ msgstr ""
 msgid "Could not get CPU Util for %(id)s: %(e)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:133
+#: ceilometer/compute/pollsters/disk.py:139
-#: ceilometer/compute/pollsters/disk.py:338
+#: ceilometer/compute/pollsters/disk.py:344
-#: ceilometer/compute/pollsters/disk.py:520
+#: ceilometer/compute/pollsters/disk.py:526
+#: ceilometer/compute/pollsters/disk.py:707
 #: ceilometer/compute/pollsters/net.py:114
 #, python-format
 msgid "%(inspector)s does not provide data for  %(pollster)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:138
+#: ceilometer/compute/pollsters/disk.py:144
-#: ceilometer/compute/pollsters/disk.py:344
+#: ceilometer/compute/pollsters/disk.py:350
-#: ceilometer/compute/pollsters/disk.py:526
+#: ceilometer/compute/pollsters/disk.py:532
-#: ceilometer/compute/pollsters/disk.py:607
+#: ceilometer/compute/pollsters/disk.py:613
 #: ceilometer/compute/pollsters/net.py:119
 #, python-format
 msgid "Ignoring instance %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:601
+#: ceilometer/compute/pollsters/disk.py:607
 #, python-format
 msgid "%(inspector)s does not provide data for %(pollster)s"
 msgstr ""
 
+#: ceilometer/compute/pollsters/disk.py:713
+#, python-format
+msgid "Ignoring instance %(name)s (%(instance_id)s) : %(error)s"
+msgstr ""
+
 #: ceilometer/compute/pollsters/memory.py:31
 #, python-format
 msgid "Checking memory usage for instance %s"
@@ -804,7 +846,7 @@ msgstr ""
 msgid "checking net info for instance %s"
 msgstr ""
 
-#: ceilometer/compute/virt/inspector.py:262
+#: ceilometer/compute/virt/inspector.py:282
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr ""
@@ -831,7 +873,7 @@ msgstr ""
 #: ceilometer/compute/virt/libvirt/inspector.py:97
 #, python-format
 msgid ""
-"Error from libvirt while looking up instance <name=%(name)s, id=%(id)>: "
+"Error from libvirt while looking up instance <name=%(name)s, id=%(id)s>: "
 "[Error Code %(error_code)s] %(ex)s"
 msgstr ""
 
@@ -943,65 +985,65 @@ msgstr ""
 msgid "Kwapi endpoint not found"
 msgstr ""
 
-#: ceilometer/event/converter.py:74
+#: ceilometer/event/converter.py:78
 #, python-format
 msgid "Plugin specified, but no plugin name supplied for trait %s"
 msgstr ""
 
-#: ceilometer/event/converter.py:83
+#: ceilometer/event/converter.py:87
 #, python-format
 msgid "No plugin named %(plugin)s available for trait %(trait)s"
 msgstr ""
 
-#: ceilometer/event/converter.py:93
+#: ceilometer/event/converter.py:97
 #, python-format
 msgid "Required field in trait definition not specified: '%s'"
 msgstr ""
 
-#: ceilometer/event/converter.py:108
+#: ceilometer/event/converter.py:112
 #, python-format
 msgid ""
 "Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: "
 "%(err)s"
 msgstr ""
 
-#: ceilometer/event/converter.py:114
+#: ceilometer/event/converter.py:118
 #, python-format
 msgid "Invalid trait type '%(type)s' for trait %(trait)s"
 msgstr ""
 
-#: ceilometer/event/converter.py:166
+#: ceilometer/event/converter.py:171
 #, python-format
 msgid "Required field %s not specified"
 msgstr ""
 
-#: ceilometer/event/converter.py:341
+#: ceilometer/event/converter.py:348
 #, python-format
 msgid "Dropping Notification %(type)s (uuid:%(msgid)s)"
 msgstr ""
 
-#: ceilometer/event/converter.py:365
+#: ceilometer/event/converter.py:372
 #, python-format
 msgid "Event Definitions configuration file: %s"
 msgstr ""
 
-#: ceilometer/event/converter.py:375
+#: ceilometer/event/converter.py:382
 #, python-format
 msgid ""
 "Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s,"
 " column: %(column)s."
 msgstr ""
 
-#: ceilometer/event/converter.py:381
+#: ceilometer/event/converter.py:388
 #, python-format
 msgid "YAML error reading Event Definitions file %(file)s"
 msgstr ""
 
-#: ceilometer/event/converter.py:388
+#: ceilometer/event/converter.py:395
 msgid "No Event Definitions configuration file found! Using default config."
 msgstr ""
 
-#: ceilometer/event/converter.py:392
+#: ceilometer/event/converter.py:399
 #, python-format
 msgid "Event Definitions: %s"
 msgstr ""
@@ -1010,29 +1052,20 @@ msgstr ""
 msgid "Loading event definitions"
 msgstr ""
 
-#: ceilometer/event/storage/impl_hbase.py:123
+#: ceilometer/event/storage/impl_hbase.py:124
-#: ceilometer/event/storage/impl_sqlalchemy.py:200
+#: ceilometer/event/storage/impl_sqlalchemy.py:209
+#: ceilometer/event/storage/impl_sqlalchemy.py:213
 #: ceilometer/event/storage/pymongo_base.py:76
 #, python-format
 msgid "Failed to record event: %s"
 msgstr ""
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:196
+#: ceilometer/event/storage/impl_sqlalchemy.py:205
 #: ceilometer/event/storage/pymongo_base.py:72
 #, python-format
 msgid "Failed to record duplicated event: %s"
 msgstr ""
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:215
-#, python-format
-msgid "Getting events that match filter: %s"
-msgstr ""
-
-#: ceilometer/event/storage/impl_sqlalchemy.py:327
-#, python-format
-msgid "Get traits for %s"
-msgstr ""
-
 #: ceilometer/hardware/discovery.py:74
 #, python-format
 msgid "Couldn't obtain IP address of instance %s"
@@ -1052,7 +1085,7 @@ msgstr ""
 msgid "Can NOT load inspector %(name)s: %(err)s"
 msgstr ""
 
-#: ceilometer/ipmi/platform/intel_node_manager.py:228
+#: ceilometer/ipmi/platform/intel_node_manager.py:297
 msgid "Node Manager init failed"
 msgstr ""
 
@@ -1076,6 +1109,21 @@ msgstr ""
 msgid "running ipmitool failure"
 msgstr ""
 
+#: ceilometer/ipmi/pollsters/node.py:66
+#, python-format
+msgid "Polling %(name)s faild for %(cnt)s times!"
+msgstr ""
+
+#: ceilometer/ipmi/pollsters/node.py:71 ceilometer/ipmi/pollsters/sensor.py:74
+#, python-format
+msgid "Pollster for %s is disabled!"
+msgstr ""
+
+#: ceilometer/ipmi/pollsters/sensor.py:68
+#, python-format
+msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
+msgstr ""
+
 #: ceilometer/network/floatingip.py:54
 #, python-format
 msgid "FLOATING IP USAGE: %s"
@@ -1131,6 +1179,15 @@ msgstr ""
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr ""
 
+#: ceilometer/objectstore/rgw.py:80
+msgid "Radosgw endpoint not found"
+msgstr ""
+
+#: ceilometer/objectstore/rgw_client.py:48
+#, python-format
+msgid "RGW AdminOps API returned %(status)s %(reason)s"
+msgstr ""
+
 #: ceilometer/objectstore/swift.py:76
 msgid "Swift endpoint not found"
 msgstr ""
@@ -1157,32 +1214,6 @@ msgstr ""
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: ceilometer/openstack/common/policy.py:111
-msgid "The JSON file that defines policies."
-msgstr ""
-
-#: ceilometer/openstack/common/policy.py:114
-msgid "Default rule. Enforced when a requested rule is not found."
-msgstr ""
-
-#: ceilometer/openstack/common/policy.py:118
-msgid ""
-"Directories where policy configuration files are stored. They can be "
-"relative to any directory in the search path defined by the config_dir "
-"option, or absolute paths. The file defined by policy_file must exist for"
-" these directories to be searched."
-msgstr ""
-
-#: ceilometer/openstack/common/policy.py:142
-#, python-format
-msgid "Policy doesn't allow %s to be performed."
-msgstr ""
-
-#: ceilometer/openstack/common/policy.py:239
-#, python-format
-msgid "Rules must be an instance of dict or Rules, got %s instead"
-msgstr ""
-
 #: ceilometer/openstack/common/versionutils.py:99
 #, python-format
 msgid ""
@@ -1249,7 +1280,7 @@ msgstr ""
 msgid "Unable to send sample over UDP"
 msgstr ""
 
-#: ceilometer/storage/__init__.py:114
+#: ceilometer/storage/__init__.py:126
 #, python-format
 msgid "looking for %(name)r driver in %(namespace)r"
 msgstr ""
@@ -1284,16 +1315,20 @@ msgid ""
 "feature and going in background."
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:308
+#: ceilometer/storage/impl_sqlalchemy.py:306
 #, python-format
 msgid "Unknown metadata type. Key (%s) will not be queryable."
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:361
+#: ceilometer/storage/impl_sqlalchemy.py:359
 #, python-format
 msgid "%d samples removed from database"
 msgstr ""
 
+#: ceilometer/storage/impl_sqlalchemy.py:378
+msgid "Expired residual resource and meter definition data"
+msgstr ""
+
 #: ceilometer/storage/hbase/base.py:45
 msgid "Creating a new in-memory HBase Connection object"
 msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/ceilometer/"
 "language/de/)\n"
@@ -24,20 +24,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -49,17 +49,21 @@ msgstr "in Schleifenaufruf mit festgelegter Dauer"
 msgid "in dynamic looping call"
 msgstr "in dynamischen Schleifenaufruf"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "Regel %s konnte nicht verstanden werden"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "Kein Handler für Übereinstimmungen des Typs %s"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Nicht behandelte Ausnahme"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/ceilometer/"
 "language/de/)\n"
@@ -23,12 +23,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -38,16 +38,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor hört auf %(port)s für Prozess %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -100,3 +100,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Warten auf Beenden von %d untergeordneten Elementen"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_AU/)\n"
@@ -24,20 +24,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -49,17 +49,21 @@ msgstr "in fixed duration looping call"
 msgid "in dynamic looping call"
 msgstr "in dynamic looping call"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "Failed to understand rule %s"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "No handler for matches of kind %s"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Unhandled exception"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_AU/)\n"
@@ -23,12 +23,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -38,16 +38,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -99,3 +99,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Waiting on %d children to exit"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_GB/)\n"
@@ -25,20 +25,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr "Error connecting to coordination backend."
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr "Error sending a heartbeat to coordination backend."
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr "Error getting group membership info from coordination backend."
 
@@ -50,17 +50,21 @@ msgstr "in fixed duration looping call"
 msgid "in dynamic looping call"
 msgstr "in dynamic looping call"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "Failed to understand rule %s"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "No handler for matches of kind %s"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Unhandled exception"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_GB/)\n"
@@ -24,12 +24,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr "Coordination backend started successfully."
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr "Joined partitioning group %s"
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -39,16 +39,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -100,3 +100,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Waiting on %d children to exit"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr "Publishing policy set to %s"

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

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-02 11:04+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
 "ceilometer/language/en_GB/)\n"
@@ -20,6 +20,12 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ceilometer/notification.py:154
+msgid ""
+"Non-metric meters may be collected. It is highly advisable to disable these "
+"meters using ceilometer.conf or the pipeline.yaml"
+msgstr ""
+
 #: ceilometer/agent/discovery/endpoint.py:42
 #, python-format
 msgid "No endpoints found for service %s"
@@ -30,7 +36,14 @@ msgstr "No endpoints found for service %s"
 msgid "Expecting %(expected)d datapoints but only get %(actual)d"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:123
+#: ceilometer/api/app.py:84
+msgid ""
+"pecan_debug cannot be enabled, if workers is > 1, the value is overrided "
+"with False"
+msgstr ""
+
+#: ceilometer/compute/pollsters/disk.py:133
+#: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
@@ -55,3 +68,19 @@ msgstr ""
 #, python-format
 msgid "pid %d not in child list"
 msgstr "pid %d not in child list"
+
+#: ceilometer/publisher/kafka_broker.py:88
+#, python-format
+msgid "Publishing policy is unknown (%s) force to default"
+msgstr "Publishing policy is unknown (%s) force to default"
+
+#: ceilometer/publisher/kafka_broker.py:149
+#, python-format
+msgid "Failed to publish %d datum"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:170
+#, python-format
+msgid ""
+"Kafka Publisher max local queue length is exceeded, dropping %d oldest data"
+msgstr ""

ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 20:21+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) "
 "(http://www.transifex.com/projects/p/ceilometer/language/en_GB/)\n"
@@ -33,17 +33,17 @@ msgstr "UDP: Storing %s"
 msgid "UDP: Unable to store meter"
 msgstr "UDP: Unable to store meter"
 
-#: ceilometer/notification.py:144 ceilometer/notifier.py:46
+#: ceilometer/notification.py:163 ceilometer/notifier.py:46
 #, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "Failed to load any notification handlers for %s"
 
-#: ceilometer/notification.py:157
+#: ceilometer/notification.py:179
 #, python-format
 msgid "Event types from %(name)s: %(type)s (ack_on_error=%(error)s)"
 msgstr "Event types from %(name)s: %(type)s (ack_on_error=%(error)s)"
 
-#: ceilometer/notification.py:191
+#: ceilometer/notification.py:213
 #, python-format
 msgid "Pipeline endpoint: %s"
 msgstr ""
@@ -53,12 +53,12 @@ msgstr ""
 msgid "loading notification handlers from %s"
 msgstr "loading notification handlers from %s"
 
-#: ceilometer/pipeline.py:311
+#: ceilometer/pipeline.py:312
 #, python-format
 msgid "Unable to load publisher %s"
 msgstr "Unable to load publisher %s"
 
-#: ceilometer/pipeline.py:329
+#: ceilometer/pipeline.py:330
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Setup transformer instance %(name)s with parameter"
@@ -67,17 +67,17 @@ msgstr ""
 "Pipeline %(pipeline)s: Setup transformer instance %(name)s with parameter"
 " %(param)s"
 
-#: ceilometer/pipeline.py:348 ceilometer/pipeline.py:412
+#: ceilometer/pipeline.py:349 ceilometer/pipeline.py:413
 #, python-format
 msgid "Pipeline %(pipeline)s: Continue after error from publisher %(pub)s"
 msgstr "Pipeline %(pipeline)s: Continue after error from publisher %(pub)s"
 
-#: ceilometer/pipeline.py:367
+#: ceilometer/pipeline.py:368
 #, python-format
 msgid "Pipeline %(pipeline)s: Sample dropped by transformer %(trans)s"
 msgstr "Pipeline %(pipeline)s: Sample dropped by transformer %(trans)s"
 
-#: ceilometer/pipeline.py:375
+#: ceilometer/pipeline.py:376
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
@@ -86,30 +86,30 @@ msgstr ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
 "%(smp)s"
 
-#: ceilometer/pipeline.py:398
+#: ceilometer/pipeline.py:399
 #, python-format
 msgid "Pipeline %(pipeline)s: Transform sample %(smp)s from %(trans)s transformer"
 msgstr "Pipeline %(pipeline)s: Transform sample %(smp)s from %(trans)s transformer"
 
-#: ceilometer/pipeline.py:428
+#: ceilometer/pipeline.py:429
 #, python-format
 msgid "Pipeline %(pipeline)s: Error flushing transformer %(trans)s"
 msgstr "Pipeline %(pipeline)s: Error flushing transformer %(trans)s"
 
-#: ceilometer/pipeline.py:624
+#: ceilometer/pipeline.py:625
 msgid "detected decoupled pipeline config format"
 msgstr "detected decoupled pipeline config format"
 
-#: ceilometer/pipeline.py:645
+#: ceilometer/pipeline.py:646
 msgid "detected deprecated pipeline config format"
 msgstr "detected deprecated pipeline config format"
 
-#: ceilometer/pipeline.py:669
+#: ceilometer/pipeline.py:670
 #, python-format
 msgid "Pipeline config file: %s"
 msgstr "Pipeline config file: %s"
 
-#: ceilometer/pipeline.py:675
+#: ceilometer/pipeline.py:676
 #, python-format
 msgid "Pipeline config: %s"
 msgstr "Pipeline config: %s"
@@ -119,27 +119,49 @@ msgstr "Pipeline config: %s"
 msgid "%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
 msgstr "%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
 
-#: ceilometer/agent/base.py:127
+#: ceilometer/agent/base.py:130
 #, python-format
 msgid "Polling pollster %(poll)s in the context of %(src)s"
 msgstr ""
 
-#: ceilometer/agent/base.py:140
+#: ceilometer/agent/base.py:161
+#, python-format
+msgid ""
+"Found following duplicated resoures for %(name)s in context of "
+"%(source)s:%(list)s. Check pipeline configuration."
+msgstr ""
+
+#: ceilometer/agent/base.py:172
 #, python-format
 msgid "Skip polling pollster %s, no resources found"
 msgstr ""
 
-#: ceilometer/agent/base.py:152
+#: ceilometer/agent/base.py:184
+#, python-format
+msgid "Prevent pollster %(name)s for polling source %(source)s anymore!"
+msgstr ""
+
+#: ceilometer/agent/base.py:190
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Continue after error from %(name)s: %(error)s"
 
-#: ceilometer/agent/base.py:298
+#: ceilometer/agent/base.py:244
+#, python-format
+msgid "Skip loading extension for %s"
+msgstr ""
+
+#: ceilometer/agent/base.py:248
+#, python-format
+msgid "Failed to import extension for %(name)s: %(error)s"
+msgstr ""
+
+#: ceilometer/agent/base.py:357
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr "Unable to discover resources: %s"
 
-#: ceilometer/agent/base.py:300
+#: ceilometer/agent/base.py:359
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr "Unknown discovery extension: %s"
@@ -248,16 +270,66 @@ 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"
 
 #: ceilometer/alarm/evaluator/combination.py:99
+#: ceilometer/alarm/evaluator/gnocchi.py:207
 #: ceilometer/alarm/evaluator/threshold.py:178
 #, python-format
 msgid "Attempted to evaluate alarm %s, but it is not within its time constraint."
 msgstr "Attempted to evaluate alarm %s, but it is not within its time constraint."
 
+#: ceilometer/alarm/evaluator/gnocchi.py:99
+#: ceilometer/alarm/evaluator/threshold.py:89
+#, python-format
+msgid "stats query %s"
+msgstr "stats query %s"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:103
+#: ceilometer/alarm/evaluator/threshold.py:95
+msgid "alarm stats retrieval failed"
+msgstr "alarm stats retrieval failed"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:106
+#, python-format
+msgid "alarm stats retrieval failed: %s"
+msgstr ""
+
+#: ceilometer/alarm/evaluator/gnocchi.py:121
 #: ceilometer/alarm/evaluator/threshold.py:56
 #, python-format
 msgid "query stats from %(start)s to %(now)s"
 msgstr "query stats from %(start)s to %(now)s"
 
+#: ceilometer/alarm/evaluator/gnocchi.py:133
+#: ceilometer/alarm/evaluator/threshold.py:112
+#, python-format
+msgid "%d datapoints are unknown"
+msgstr "%d datapoints are unknown"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:156
+#: 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 ""
+"Transition to %(state)s due to %(count)d samples %(disposition)s "
+"threshold, most recent: %(most_recent)s"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:160
+#: 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 ""
+"Remaining as %(state)s due to %(count)d samples %(disposition)s "
+"threshold, most recent: %(most_recent)s"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:219
+#: ceilometer/alarm/evaluator/threshold.py:197
+#, python-format
+msgid "comparing value %(value)s against threshold %(limit)s"
+msgstr "comparing value %(value)s against threshold %(limit)s"
+
 #: ceilometer/alarm/evaluator/threshold.py:66
 #, python-format
 msgid "sanitize stats %s"
@@ -273,43 +345,6 @@ msgstr "excluded weak datapoints with sample counts %s"
 msgid "pruned statistics to %d"
 msgstr "pruned statistics to %d"
 
-#: ceilometer/alarm/evaluator/threshold.py:89
-#, python-format
-msgid "stats query %s"
-msgstr "stats query %s"
-
-#: ceilometer/alarm/evaluator/threshold.py:95
-msgid "alarm stats retrieval failed"
-msgstr "alarm stats retrieval failed"
-
-#: ceilometer/alarm/evaluator/threshold.py:112
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d datapoints are unknown"
-
-#: 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 ""
-"Transition to %(state)s due to %(count)d samples %(disposition)s "
-"threshold, most recent: %(most_recent)s"
-
-#: 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 ""
-"Remaining as %(state)s due to %(count)d samples %(disposition)s "
-"threshold, most recent: %(most_recent)s"
-
-#: ceilometer/alarm/evaluator/threshold.py:197
-#, python-format
-msgid "comparing value %(value)s against threshold %(limit)s"
-msgstr "comparing value %(value)s against threshold %(limit)s"
-
 #: ceilometer/alarm/notifier/log.py:30
 #, python-format
 msgid ""
@@ -476,21 +511,21 @@ msgstr ""
 msgid "state_timestamp should be datetime object"
 msgstr ""
 
-#: ceilometer/api/app.py:163
+#: ceilometer/api/app.py:136
 #, python-format
 msgid "Starting server in PID %s"
 msgstr "Starting server in PID %s"
 
-#: ceilometer/api/app.py:164
+#: ceilometer/api/app.py:137
 msgid "Configuration:"
 msgstr "Configuration:"
 
-#: ceilometer/api/app.py:168
+#: ceilometer/api/app.py:141
 #, python-format
 msgid "serving on 0.0.0.0:%(sport)s, view at http://127.0.0.1:%(vport)s"
 msgstr "serving on 0.0.0.0:%(sport)s, view at http://127.0.0.1:%(vport)s"
 
-#: ceilometer/api/app.py:172
+#: ceilometer/api/app.py:145
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr "serving on http://%(host)s:%(port)s"
@@ -500,118 +535,85 @@ msgstr "serving on http://%(host)s:%(port)s"
 msgid "Error parsing HTTP response: %s"
 msgstr "Error parsing HTTP response: %s"
 
-#: ceilometer/api/controllers/v2/alarms.py:80
+#: ceilometer/api/controllers/v2/alarms.py:84
-#, python-format
-msgid "Alarm %s not found"
-msgstr "Alarm %s not found"
-
-#: ceilometer/api/controllers/v2/alarms.py:82
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "Alarm %(alarm_id)s not found in project %(project)s"
-
-#: ceilometer/api/controllers/v2/alarms.py:95
 #, 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"
 
-#: ceilometer/api/controllers/v2/alarms.py:207
+#: ceilometer/api/controllers/v2/alarms.py:166
-#, 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"
-
-#: ceilometer/api/controllers/v2/alarms.py:253
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "Combined state of alarms %s"
-
-#: ceilometer/api/controllers/v2/alarms.py:262
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr "Alarm combination rule should contain at least two different alarm ids."
-
-#: ceilometer/api/controllers/v2/alarms.py:283
-#, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "Cannot specify alarm %s itself in combination rule"
-
-#: ceilometer/api/controllers/v2/alarms.py:333
 #, python-format
 msgid "Timezone %s is not valid"
 msgstr "Timezone %s is not valid"
 
-#: ceilometer/api/controllers/v2/alarms.py:445
+#: ceilometer/api/controllers/v2/alarms.py:281
 msgid "Time constraint names must be unique for a given alarm."
 msgstr "Time constraint names must be unique for a given alarm."
 
-#: ceilometer/api/controllers/v2/alarms.py:455
+#: ceilometer/api/controllers/v2/alarms.py:291
 #, python-format
 msgid "%(rule)s must be set for %(type)s type alarm"
 msgstr "%(rule)s must be set for %(type)s type alarm"
 
-#: ceilometer/api/controllers/v2/alarms.py:466
+#: ceilometer/api/controllers/v2/alarms.py:302
 #, python-format
 msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:483
+#: ceilometer/api/controllers/v2/alarms.py:319
 #, python-format
 msgid "Unable to parse action %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:486
+#: ceilometer/api/controllers/v2/alarms.py:322
 #, python-format
 msgid "Unsupported action %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:670
+#: ceilometer/api/controllers/v2/alarms.py:509
 #, python-format
 msgid "Alarm with name=%s exists"
 msgstr "Alarm with name=%s exists"
 
-#: ceilometer/api/controllers/v2/alarms.py:680
+#: ceilometer/api/controllers/v2/alarms.py:519
 #, python-format
 msgid "Error while putting alarm: %s"
 msgstr "Error while putting alarm: %s"
 
-#: ceilometer/api/controllers/v2/alarms.py:681
+#: ceilometer/api/controllers/v2/alarms.py:520
-#: ceilometer/api/controllers/v2/alarms.py:849
+#: ceilometer/api/controllers/v2/alarms.py:688
 msgid "Alarm incorrect"
 msgstr "Alarm incorrect"
 
-#: ceilometer/api/controllers/v2/alarms.py:741
+#: ceilometer/api/controllers/v2/alarms.py:580
 msgid "state invalid"
 msgstr "state invalid"
 
-#: ceilometer/api/controllers/v2/alarms.py:842
+#: ceilometer/api/controllers/v2/alarms.py:681
 #, python-format
 msgid "Alarm with name='%s' exists"
 msgstr "Alarm with name='%s' exists"
 
-#: ceilometer/api/controllers/v2/alarms.py:848
+#: ceilometer/api/controllers/v2/alarms.py:687
 #, python-format
 msgid "Error while posting alarm: %s"
 msgstr "Error while posting alarm: %s"
 
-#: ceilometer/api/controllers/v2/base.py:48
+#: ceilometer/api/controllers/v2/base.py:50
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s Not Found"
 
-#: ceilometer/api/controllers/v2/base.py:57
+#: ceilometer/api/controllers/v2/base.py:59
 #, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
 msgstr "Not Authorised to access %(aspect)s %(id)s"
 
-#: ceilometer/api/controllers/v2/base.py:216
+#: ceilometer/api/controllers/v2/base.py:220
 #, python-format
 msgid "Unable to convert the value %(value)s to the expected data type %(type)s."
 msgstr "Unable to convert the value %(value)s to the expected data type %(type)s."
 
-#: ceilometer/api/controllers/v2/base.py:221
+#: ceilometer/api/controllers/v2/base.py:225
 #, python-format
 msgid ""
 "The data type %(type)s is not supported. The supported data type list is:"
@@ -620,7 +622,7 @@ msgstr ""
 "The data type %(type)s is not supported. The supported data type list is:"
 " %(supported)s"
 
-#: ceilometer/api/controllers/v2/base.py:226
+#: ceilometer/api/controllers/v2/base.py:230
 #, python-format
 msgid ""
 "Unexpected exception converting %(value)s to the expected data type "
@@ -629,20 +631,30 @@ msgstr ""
 "Unexpected exception converting %(value)s to the expected data type "
 "%(type)s."
 
-#: ceilometer/api/controllers/v2/events.py:168
+#: ceilometer/api/controllers/v2/base.py:240
+#, python-format
+msgid "Alarm %s not found"
+msgstr "Alarm %s not found"
+
+#: ceilometer/api/controllers/v2/base.py:242
+#, python-format
+msgid "Alarm %(alarm_id)s not found in project %(project)s"
+msgstr "Alarm %(alarm_id)s not found in project %(project)s"
+
+#: ceilometer/api/controllers/v2/events.py:172
 msgid "operator {} is incorrect"
 msgstr "operator {} is incorrect"
 
-#: ceilometer/api/controllers/v2/events.py:190
+#: ceilometer/api/controllers/v2/events.py:195
 #, python-format
 msgid "Getting traits for %s"
 msgstr "Getting traits for %s"
 
-#: ceilometer/api/controllers/v2/events.py:260
+#: ceilometer/api/controllers/v2/events.py:266
 msgid "Event"
 msgstr "Event"
 
-#: ceilometer/api/controllers/v2/events.py:263
+#: ceilometer/api/controllers/v2/events.py:269
 #, python-format
 msgid "More than one event with id %s returned from storage driver"
 msgstr "More than one event with id %s returned from storage driver"
@@ -706,6 +718,29 @@ msgstr "Resource"
 msgid "Sample"
 msgstr "Sample"
 
+#: ceilometer/api/controllers/v2/alarm_rules/combination.py:39
+#, python-format
+msgid "Combined state of alarms %s"
+msgstr "Combined state of alarms %s"
+
+#: ceilometer/api/controllers/v2/alarm_rules/combination.py:48
+msgid "Alarm combination rule should contain at least two different alarm ids."
+msgstr "Alarm combination rule should contain at least two different alarm ids."
+
+#: ceilometer/api/controllers/v2/alarm_rules/combination.py:69
+#, python-format
+msgid "Cannot specify alarm %s itself in combination rule"
+msgstr "Cannot specify alarm %s itself in combination rule"
+
+#: 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 ""
+"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
+"%(threshold)s over %(period)s seconds"
+
 #: ceilometer/cmd/storage.py:39
 msgid "Clearing expired metering data"
 msgstr "Clearing expired metering data"
@@ -739,10 +774,11 @@ msgstr "CPUTIME USAGE: %(instance)s %(time)d"
 
 #: ceilometer/compute/pollsters/cpu.py:48
 #: ceilometer/compute/pollsters/cpu.py:79
-#: ceilometer/compute/pollsters/disk.py:125
+#: ceilometer/compute/pollsters/disk.py:131
-#: ceilometer/compute/pollsters/disk.py:335
+#: ceilometer/compute/pollsters/disk.py:341
-#: ceilometer/compute/pollsters/disk.py:517
+#: ceilometer/compute/pollsters/disk.py:523
-#: ceilometer/compute/pollsters/disk.py:598
+#: ceilometer/compute/pollsters/disk.py:604
+#: ceilometer/compute/pollsters/disk.py:699
 #: ceilometer/compute/pollsters/memory.py:47
 #: ceilometer/compute/pollsters/net.py:106
 #, python-format
@@ -779,28 +815,34 @@ msgstr "Obtaining CPU Util is not implemented for %s"
 msgid "Could not get CPU Util for %(id)s: %(e)s"
 msgstr "Could not get CPU Util for %(id)s: %(e)s"
 
-#: ceilometer/compute/pollsters/disk.py:133
+#: ceilometer/compute/pollsters/disk.py:139
-#: ceilometer/compute/pollsters/disk.py:338
+#: ceilometer/compute/pollsters/disk.py:344
-#: ceilometer/compute/pollsters/disk.py:520
+#: ceilometer/compute/pollsters/disk.py:526
+#: ceilometer/compute/pollsters/disk.py:707
 #: ceilometer/compute/pollsters/net.py:114
 #, python-format
 msgid "%(inspector)s does not provide data for  %(pollster)s"
 msgstr "%(inspector)s does not provide data for  %(pollster)s"
 
-#: ceilometer/compute/pollsters/disk.py:138
+#: ceilometer/compute/pollsters/disk.py:144
-#: ceilometer/compute/pollsters/disk.py:344
+#: ceilometer/compute/pollsters/disk.py:350
-#: ceilometer/compute/pollsters/disk.py:526
+#: ceilometer/compute/pollsters/disk.py:532
-#: ceilometer/compute/pollsters/disk.py:607
+#: ceilometer/compute/pollsters/disk.py:613
 #: ceilometer/compute/pollsters/net.py:119
 #, python-format
 msgid "Ignoring instance %(name)s: %(error)s"
 msgstr "Ignoring instance %(name)s: %(error)s"
 
-#: ceilometer/compute/pollsters/disk.py:601
+#: ceilometer/compute/pollsters/disk.py:607
 #, python-format
 msgid "%(inspector)s does not provide data for %(pollster)s"
 msgstr ""
 
+#: ceilometer/compute/pollsters/disk.py:713
+#, python-format
+msgid "Ignoring instance %(name)s (%(instance_id)s) : %(error)s"
+msgstr ""
+
 #: ceilometer/compute/pollsters/memory.py:31
 #, python-format
 msgid "Checking memory usage for instance %s"
@@ -826,7 +868,7 @@ msgstr "Could not get Memory Usage for %(id)s: %(e)s"
 msgid "checking net info for instance %s"
 msgstr "checking net info for instance %s"
 
-#: ceilometer/compute/virt/inspector.py:262
+#: ceilometer/compute/virt/inspector.py:282
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Unable to load the hypervisor inspector: %s"
@@ -853,7 +895,7 @@ msgstr "Connecting to libvirt: %s"
 #: ceilometer/compute/virt/libvirt/inspector.py:97
 #, python-format
 msgid ""
-"Error from libvirt while looking up instance <name=%(name)s, id=%(id)>: "
+"Error from libvirt while looking up instance <name=%(name)s, id=%(id)s>: "
 "[Error Code %(error_code)s] %(ex)s"
 msgstr ""
 
@@ -967,22 +1009,22 @@ msgstr ""
 msgid "Kwapi endpoint not found"
 msgstr "Kwapi endpoint not found"
 
-#: ceilometer/event/converter.py:74
+#: ceilometer/event/converter.py:78
 #, python-format
 msgid "Plugin specified, but no plugin name supplied for trait %s"
 msgstr "Plugin specified, but no plugin name supplied for trait %s"
 
-#: ceilometer/event/converter.py:83
+#: ceilometer/event/converter.py:87
 #, python-format
 msgid "No plugin named %(plugin)s available for trait %(trait)s"
 msgstr "No plugin named %(plugin)s available for trait %(trait)s"
 
-#: ceilometer/event/converter.py:93
+#: ceilometer/event/converter.py:97
 #, python-format
 msgid "Required field in trait definition not specified: '%s'"
 msgstr "Required field in trait definition not specified: '%s'"
 
-#: ceilometer/event/converter.py:108
+#: ceilometer/event/converter.py:112
 #, python-format
 msgid ""
 "Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: "
@@ -991,27 +1033,27 @@ msgstr ""
 "Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: "
 "%(err)s"
 
-#: ceilometer/event/converter.py:114
+#: ceilometer/event/converter.py:118
 #, python-format
 msgid "Invalid trait type '%(type)s' for trait %(trait)s"
 msgstr "Invalid trait type '%(type)s' for trait %(trait)s"
 
-#: ceilometer/event/converter.py:166
+#: ceilometer/event/converter.py:171
 #, python-format
 msgid "Required field %s not specified"
 msgstr "Required field %s not specified"
 
-#: ceilometer/event/converter.py:341
+#: ceilometer/event/converter.py:348
 #, python-format
 msgid "Dropping Notification %(type)s (uuid:%(msgid)s)"
 msgstr "Dropping Notification %(type)s (uuid:%(msgid)s)"
 
-#: ceilometer/event/converter.py:365
+#: ceilometer/event/converter.py:372
 #, python-format
 msgid "Event Definitions configuration file: %s"
 msgstr "Event Definitions configuration file: %s"
 
-#: ceilometer/event/converter.py:375
+#: ceilometer/event/converter.py:382
 #, python-format
 msgid ""
 "Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s,"
@@ -1020,16 +1062,16 @@ msgstr ""
 "Invalid YAML syntax in Event Definitions file %(file)s at line: %(line)s,"
 " column: %(column)s."
 
-#: ceilometer/event/converter.py:381
+#: ceilometer/event/converter.py:388
 #, python-format
 msgid "YAML error reading Event Definitions file %(file)s"
 msgstr "YAML error reading Event Definitions file %(file)s"
 
-#: ceilometer/event/converter.py:388
+#: ceilometer/event/converter.py:395
 msgid "No Event Definitions configuration file found! Using default config."
 msgstr "No Event Definitions configuration file found! Using default config."
 
-#: ceilometer/event/converter.py:392
+#: ceilometer/event/converter.py:399
 #, python-format
 msgid "Event Definitions: %s"
 msgstr "Event Definitions: %s"
@@ -1038,29 +1080,20 @@ msgstr "Event Definitions: %s"
 msgid "Loading event definitions"
 msgstr "Loading event definitions"
 
-#: ceilometer/event/storage/impl_hbase.py:123
+#: ceilometer/event/storage/impl_hbase.py:124
-#: ceilometer/event/storage/impl_sqlalchemy.py:200
+#: ceilometer/event/storage/impl_sqlalchemy.py:209
+#: ceilometer/event/storage/impl_sqlalchemy.py:213
 #: ceilometer/event/storage/pymongo_base.py:76
 #, python-format
 msgid "Failed to record event: %s"
 msgstr "Failed to record event: %s"
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:196
+#: ceilometer/event/storage/impl_sqlalchemy.py:205
 #: ceilometer/event/storage/pymongo_base.py:72
 #, python-format
 msgid "Failed to record duplicated event: %s"
 msgstr "Failed to record duplicated event: %s"
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:215
-#, python-format
-msgid "Getting events that match filter: %s"
-msgstr "Getting events that match filter: %s"
-
-#: ceilometer/event/storage/impl_sqlalchemy.py:327
-#, python-format
-msgid "Get traits for %s"
-msgstr "Get traits for %s"
-
 #: ceilometer/hardware/discovery.py:74
 #, python-format
 msgid "Couldn't obtain IP address of instance %s"
@@ -1080,7 +1113,7 @@ msgstr "inspector call failed for %(ident)s host %(host)s: %(err)s"
 msgid "Can NOT load inspector %(name)s: %(err)s"
 msgstr "Can NOT load inspector %(name)s: %(err)s"
 
-#: ceilometer/ipmi/platform/intel_node_manager.py:228
+#: ceilometer/ipmi/platform/intel_node_manager.py:297
 msgid "Node Manager init failed"
 msgstr ""
 
@@ -1104,6 +1137,21 @@ msgstr ""
 msgid "running ipmitool failure"
 msgstr ""
 
+#: ceilometer/ipmi/pollsters/node.py:66
+#, python-format
+msgid "Polling %(name)s faild for %(cnt)s times!"
+msgstr ""
+
+#: ceilometer/ipmi/pollsters/node.py:71 ceilometer/ipmi/pollsters/sensor.py:74
+#, python-format
+msgid "Pollster for %s is disabled!"
+msgstr ""
+
+#: ceilometer/ipmi/pollsters/sensor.py:68
+#, python-format
+msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
+msgstr ""
+
 #: ceilometer/network/floatingip.py:54
 #, python-format
 msgid "FLOATING IP USAGE: %s"
@@ -1159,6 +1207,15 @@ msgstr "OpenDaylitght API returned %(status)s %(reason)s"
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "Request failed to connect to OpenDaylight with NorthBound REST API"
 
+#: ceilometer/objectstore/rgw.py:80
+msgid "Radosgw endpoint not found"
+msgstr ""
+
+#: ceilometer/objectstore/rgw_client.py:48
+#, python-format
+msgid "RGW AdminOps API returned %(status)s %(reason)s"
+msgstr ""
+
 #: ceilometer/objectstore/swift.py:76
 msgid "Swift endpoint not found"
 msgstr "Swift endpoint not found"
@@ -1185,32 +1242,6 @@ msgstr "syslog facility must be one of: %s"
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Fatal call to deprecated config: %(msg)s"
 
-#: ceilometer/openstack/common/policy.py:111
-msgid "The JSON file that defines policies."
-msgstr "The JSON file that defines policies."
-
-#: ceilometer/openstack/common/policy.py:114
-msgid "Default rule. Enforced when a requested rule is not found."
-msgstr "Default rule. Enforced when a requested rule is not found."
-
-#: ceilometer/openstack/common/policy.py:118
-msgid ""
-"Directories where policy configuration files are stored. They can be "
-"relative to any directory in the search path defined by the config_dir "
-"option, or absolute paths. The file defined by policy_file must exist for"
-" these directories to be searched."
-msgstr ""
-
-#: ceilometer/openstack/common/policy.py:142
-#, python-format
-msgid "Policy doesn't allow %s to be performed."
-msgstr "Policy doesn't allow %s to be performed."
-
-#: ceilometer/openstack/common/policy.py:239
-#, python-format
-msgid "Rules must be an instance of dict or Rules, got %s instead"
-msgstr "Rules must be an instance of dict or Rules, got %s instead"
-
 #: ceilometer/openstack/common/versionutils.py:99
 #, python-format
 msgid ""
@@ -1277,7 +1308,7 @@ msgstr "Publishing sample %(msg)s over UDP to %(host)s:%(port)d"
 msgid "Unable to send sample over UDP"
 msgstr "Unable to send sample over UDP"
 
-#: ceilometer/storage/__init__.py:114
+#: ceilometer/storage/__init__.py:126
 #, python-format
 msgid "looking for %(name)r driver in %(namespace)r"
 msgstr "looking for %(name)r driver in %(namespace)r"
@@ -1312,16 +1343,20 @@ msgid ""
 "feature and going in background."
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:308
+#: ceilometer/storage/impl_sqlalchemy.py:306
 #, python-format
 msgid "Unknown metadata type. Key (%s) will not be queryable."
 msgstr "Unknown metadata type. Key (%s) will not be queryable."
 
-#: ceilometer/storage/impl_sqlalchemy.py:361
+#: ceilometer/storage/impl_sqlalchemy.py:359
 #, python-format
 msgid "%d samples removed from database"
 msgstr "%d samples removed from database"
 
+#: ceilometer/storage/impl_sqlalchemy.py:378
+msgid "Expired residual resource and meter definition data"
+msgstr ""
+
 #: ceilometer/storage/hbase/base.py:45
 msgid "Creating a new in-memory HBase Connection object"
 msgstr "Creating a new in-memory HBase Connection object"

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/ceilometer/"
 "language/es/)\n"
@@ -24,20 +24,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -49,17 +49,21 @@ msgstr "en llamada en bucle de duración fija"
 msgid "in dynamic looping call"
 msgstr "en llamada en bucle dinámica"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "Ha ocurrido un error al interpretar la regla %s"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "No hay manejador para coincidencias de clase %s"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Excepción no controlada"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/ceilometer/"
 "language/es/)\n"
@@ -23,12 +23,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -38,16 +38,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet oculto escuchando en %(port)s para el proceso %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -99,3 +99,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "En espera de %d hijos para salir"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
 "language/fr/)\n"
@@ -26,20 +26,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr "Erreur de connexion à la coordination du backend ."
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -51,17 +51,21 @@ msgstr "dans l'appel en boucle de durée fixe"
 msgid "in dynamic looping call"
 msgstr "dans l'appel en boucle dynamique"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "Règle %s incompréhensible"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "Aucun gestionnaire pour les correspondances de type %s"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Exception non gérée"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -5,13 +5,13 @@
 # Translators:
 # Bruno Cornec <bruno.cornec@hp.com>, 2014
 # Frédéric <frosmont@free.fr>, 2014
-# Maxime COQUEREL <max.coquerel@gmail.com>, 2014
+# Maxime COQUEREL <max.coquerel@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
 "language/fr/)\n"
@@ -26,31 +26,31 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr "Coordination avec le backend démarré avec succès."
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr "Le groupe de partitionnement %s a été rejoint"
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
-msgstr ""
+msgstr "Groupe de partitionnement Gauche %s"
 
 #: ceilometer/event/storage/impl_log.py:32
 #, python-format
 msgid "Dropping event data with TTL %d"
-msgstr ""
+msgstr "Suppression de la donnée de l’événement avec le TTL %d"
+
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr "Les événements %d sont supprimés de la base de donnée"
 
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor en écoute sur le port %(port)s for process %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -96,9 +96,14 @@ msgstr "%s interceptée, arrêt de l'enfant"
 
 #: ceilometer/openstack/common/service.py:399
 msgid "Wait called after thread killed. Cleaning up."
-msgstr ""
+msgstr "Pause demandée après suppression de thread. Nettoyage."
 
 #: ceilometer/openstack/common/service.py:415
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "En attente %d enfants pour sortie"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr "La politique de publication est réglé sur %s"

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

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-02 11:04+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
 "language/fr/)\n"
@@ -21,6 +21,12 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ceilometer/notification.py:154
+msgid ""
+"Non-metric meters may be collected. It is highly advisable to disable these "
+"meters using ceilometer.conf or the pipeline.yaml"
+msgstr ""
+
 #: ceilometer/agent/discovery/endpoint.py:42
 #, python-format
 msgid "No endpoints found for service %s"
@@ -31,7 +37,14 @@ msgstr "Pas endpoints trouvé pour le service %s"
 msgid "Expecting %(expected)d datapoints but only get %(actual)d"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:123
+#: ceilometer/api/app.py:84
+msgid ""
+"pecan_debug cannot be enabled, if workers is > 1, the value is overrided "
+"with False"
+msgstr ""
+
+#: ceilometer/compute/pollsters/disk.py:133
+#: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
@@ -56,3 +69,19 @@ msgstr ""
 #, python-format
 msgid "pid %d not in child list"
 msgstr "PID %d absent de la liste d'enfants"
+
+#: ceilometer/publisher/kafka_broker.py:88
+#, python-format
+msgid "Publishing policy is unknown (%s) force to default"
+msgstr "La politique de publication est inconnue (%s) forcé le défaut"
+
+#: ceilometer/publisher/kafka_broker.py:149
+#, python-format
+msgid "Failed to publish %d datum"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:170
+#, python-format
+msgid ""
+"Kafka Publisher max local queue length is exceeded, dropping %d oldest data"
+msgstr ""

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

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/ceilometer/"
 "language/it/)\n"
@@ -24,12 +24,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -39,16 +39,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Ascolto di eventlet backdoor su %(port)s per il processo %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -100,3 +100,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "In attesa %d degli elementi secondari per uscire"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/ceilometer/"
 "language/ja/)\n"
@@ -24,20 +24,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -49,17 +49,21 @@ msgstr "一定期間の呼び出しループ"
 msgid "in dynamic looping call"
 msgstr "動的呼び出しループ"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "ルール %s を解釈できませんでした"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "種類 %s の一致向けのハンドラーがありません"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "未処理例外"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/"
 "ceilometer/language/ko_KR/)\n"
@@ -24,20 +24,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -49,17 +49,21 @@ msgstr "고정 기간 루프 호출에서"
 msgid "in dynamic looping call"
 msgstr "동적 루프 호출에서"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "%s 규칙을 이해하는데 실패했습니다"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "%s 유형의 일치에 대한 핸들러가 없음"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "처리되지 않은 예외"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/"
 "ceilometer/language/ko_KR/)\n"
@@ -23,12 +23,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -38,16 +38,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet 백도어는 프로세스 %(pid)d 일 동안 %(port)s에서 수신"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr "%s: 정책 디렉토리를 찾을 수 없습니다."
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -99,3 +99,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "%d 하위에서 종료하기를 대기 중임"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "ceilometer/language/pt_BR/)\n"
@@ -24,20 +24,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -49,17 +49,21 @@ msgstr "em uma chamada de laço de duração fixa"
 msgid "in dynamic looping call"
 msgstr "em chamada de laço dinâmico"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "Falha ao interpretar regra %s"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "Nenhum manipulador para correspondências do tipo %s"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "Exceção não tratada"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "ceilometer/language/pt_BR/)\n"
@@ -23,12 +23,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -38,16 +38,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Backdoor de Eventlet escutando na porta %(port)s pelo processo %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -99,3 +99,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Aguardando em %d filhos para sair"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Telugu (India) (http://www.transifex.com/projects/p/"
 "ceilometer/language/te_IN/)\n"
@@ -23,12 +23,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -38,16 +38,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr ""
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -99,3 +99,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "%d పిల్లల వెయిటింగ్ నిష్క్రమణ"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-03 11:11+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
 "ceilometer/language/vi_VN/)\n"
@@ -25,20 +25,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr ""
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr ""
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr ""
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr ""
 
@@ -50,17 +50,21 @@ msgstr "trong cuộc gọi vòng lặp thời khoảng cố định "
 msgid "in dynamic looping call"
 msgstr "trong cuộc gọi lặp động"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "Không hiểu luật %s"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "Không có bộ xử lý thích ứng của loại %s"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "ngoại lệ không được quản lý"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-05 16:05+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/"
 "ceilometer/language/vi_VN/)\n"
@@ -24,12 +24,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr ""
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr ""
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr ""
@@ -39,16 +39,16 @@ msgstr ""
 msgid "Dropping event data with TTL %d"
 msgstr ""
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet backdoor lắng nghe trên %(port)s đối với tiến trình %(pid)d"
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr ""
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -100,3 +100,8 @@ msgstr ""
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Chờ đợi %d tiến trình con để thoát "
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr ""

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

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-04 08:09+0000\n"
+"PO-Revision-Date: 2015-03-11 20:49+0000\n"
-"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -26,20 +26,20 @@ msgstr ""
 msgid "Dispatcher failed to handle the %s, requeue it."
 msgstr "分发器处理%s失败，重新入队"
 
-#: ceilometer/collector.py:207
+#: ceilometer/collector.py:208
 #, python-format
 msgid "Error processing event and it will be dropped: %s"
 msgstr "处理事件%s时报错，将其丢弃"
 
-#: ceilometer/coordination.py:79
+#: ceilometer/coordination.py:79 ceilometer/coordination.py:91
 msgid "Error connecting to coordination backend."
 msgstr "无法连接到协调器后端"
 
-#: ceilometer/coordination.py:92
+#: ceilometer/coordination.py:107
 msgid "Error sending a heartbeat to coordination backend."
 msgstr "无法发送心跳信息到协调器后端"
 
-#: ceilometer/coordination.py:159
+#: ceilometer/coordination.py:177
 msgid "Error getting group membership info from coordination backend."
 msgstr "从协调器后端获取组成员信息时出错"
 
@@ -51,17 +51,21 @@ msgstr "在固定时段内循环调用"
 msgid "in dynamic looping call"
 msgstr "在动态循环调用中"
 
-#: ceilometer/openstack/common/policy.py:563
-#: ceilometer/openstack/common/policy.py:843
-#, python-format
-msgid "Failed to understand rule %s"
-msgstr "未能理解规则 %s"
-
-#: ceilometer/openstack/common/policy.py:573
-#, python-format
-msgid "No handler for matches of kind %s"
-msgstr "对于类型为 %s 的匹配项，不存在任何处理程序"
-
 #: ceilometer/openstack/common/service.py:268
 msgid "Unhandled exception"
 msgstr "存在未处理的异常"
+
+#: ceilometer/publisher/kafka_broker.py:95
+#: ceilometer/publisher/kafka_broker.py:177
+#, python-format
+msgid "Failed to connect to Kafka service: %s"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:158
+msgid "Failed to retry to send sample data with max_retry times"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:198
+#, python-format
+msgid "Failed to send sample data: %s"
+msgstr ""

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

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-09 06:33+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
-"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -25,12 +25,12 @@ msgstr ""
 msgid "Coordination backend started successfully."
 msgstr "协调器后台启动成功"
 
-#: ceilometer/coordination.py:111
+#: ceilometer/coordination.py:126
 #, python-format
 msgid "Joined partitioning group %s"
 msgstr "已加入分组%s"
 
-#: ceilometer/coordination.py:126
+#: ceilometer/coordination.py:144
 #, python-format
 msgid "Left partitioning group %s"
 msgstr "已离开分组%s"
@@ -40,16 +40,16 @@ msgstr "已离开分组%s"
 msgid "Dropping event data with TTL %d"
 msgstr "正在根据TTL: %d丢弃事件数据"
 
+#: ceilometer/event/storage/impl_sqlalchemy.py:430
+#, python-format
+msgid "%d events are removed from database"
+msgstr ""
+
 #: ceilometer/openstack/common/eventlet_backdoor.py:146
 #, python-format
 msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
 msgstr "Eventlet为进程 %(pid)d 在后台监听 %(port)s "
 
-#: ceilometer/openstack/common/policy.py:275
-#, python-format
-msgid "Can not find policy directory: %s"
-msgstr "无法找到策略目录:%s"
-
 #: ceilometer/openstack/common/service.py:173
 #, python-format
 msgid "Caught %s, exiting"
@@ -101,3 +101,8 @@ msgstr "线程结束，正在清理"
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "正在等待 %d 个子线程退出"
+
+#: ceilometer/publisher/kafka_broker.py:86
+#, python-format
+msgid "Publishing policy set to %s"
+msgstr "设置发布策略为%s"

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

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-05 06:19+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-04 08:18+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
-"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
 "ceilometer/language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -20,6 +20,12 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ceilometer/notification.py:154
+msgid ""
+"Non-metric meters may be collected. It is highly advisable to disable these "
+"meters using ceilometer.conf or the pipeline.yaml"
+msgstr ""
+
 #: ceilometer/agent/discovery/endpoint.py:42
 #, python-format
 msgid "No endpoints found for service %s"
@@ -30,7 +36,14 @@ msgstr "%s服务的入口未找到"
 msgid "Expecting %(expected)d datapoints but only get %(actual)d"
 msgstr "预期有 %(expected)d个数据但是只得到%(actual)d个"
 
-#: ceilometer/compute/pollsters/disk.py:123
+#: ceilometer/api/app.py:84
+msgid ""
+"pecan_debug cannot be enabled, if workers is > 1, the value is overrided "
+"with False"
+msgstr "pecan_debug无法被启用，如果api_workers>1，该值会被重置为False"
+
+#: ceilometer/compute/pollsters/disk.py:133
+#: ceilometer/compute/pollsters/disk.py:701
 #: ceilometer/compute/pollsters/memory.py:49
 #: ceilometer/compute/pollsters/net.py:108
 #, python-format
@@ -56,3 +69,19 @@ msgstr "任务%(func_name)r运行超过指定间隔%(delay).2f秒"
 #, python-format
 msgid "pid %d not in child list"
 msgstr "pid %d 没有在子进程列表中"
+
+#: ceilometer/publisher/kafka_broker.py:88
+#, python-format
+msgid "Publishing policy is unknown (%s) force to default"
+msgstr "未知的发布策略(%s)，强制使用默认策略"
+
+#: ceilometer/publisher/kafka_broker.py:149
+#, python-format
+msgid "Failed to publish %d datum"
+msgstr ""
+
+#: ceilometer/publisher/kafka_broker.py:170
+#, python-format
+msgid ""
+"Kafka Publisher max local queue length is exceeded, dropping %d oldest data"
+msgstr ""

ceilometer/locale/zh_CN/LC_MESSAGES/ceilometer.po

@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-02-11 06:10+0000\n"
+"POT-Creation-Date: 2015-03-12 06:06+0000\n"
-"PO-Revision-Date: 2015-02-09 06:41+0000\n"
+"PO-Revision-Date: 2015-03-11 21:03+0000\n"
-"Last-Translator: aji.zqfan <aji.zqfan@gmail.com>\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
 "(http://www.transifex.com/projects/p/ceilometer/language/zh_CN/)\n"
 "Plural-Forms: nplurals=1; plural=0\n"
@@ -37,17 +37,17 @@ msgstr "UDP: 正在存储%s"
 msgid "UDP: Unable to store meter"
 msgstr "UDP: 无法存储计量器"
 
-#: ceilometer/notification.py:144 ceilometer/notifier.py:46
+#: ceilometer/notification.py:163 ceilometer/notifier.py:46
 #, python-format
 msgid "Failed to load any notification handlers for %s"
 msgstr "无法为%s加载任何通知处理器"
 
-#: ceilometer/notification.py:157
+#: ceilometer/notification.py:179
 #, python-format
 msgid "Event types from %(name)s: %(type)s (ack_on_error=%(error)s)"
 msgstr ""
 
-#: ceilometer/notification.py:191
+#: ceilometer/notification.py:213
 #, python-format
 msgid "Pipeline endpoint: %s"
 msgstr " 流水线入口：%s"
@@ -57,59 +57,59 @@ msgstr " 流水线入口：%s"
 msgid "loading notification handlers from %s"
 msgstr "从%s加载通知处理器"
 
-#: ceilometer/pipeline.py:311
+#: ceilometer/pipeline.py:312
 #, python-format
 msgid "Unable to load publisher %s"
 msgstr "无法加载发布器%s"
 
-#: ceilometer/pipeline.py:329
+#: ceilometer/pipeline.py:330
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Setup transformer instance %(name)s with parameter"
 " %(param)s"
 msgstr "流水线%(pipeline)s：使用参数%(param)s初始化变形器实例%(name)s"
 
-#: ceilometer/pipeline.py:348 ceilometer/pipeline.py:412
+#: ceilometer/pipeline.py:349 ceilometer/pipeline.py:413
 #, python-format
 msgid "Pipeline %(pipeline)s: Continue after error from publisher %(pub)s"
 msgstr "流水线%(pipeline)s：发布器%(pub)s报错，继续执行"
 
-#: ceilometer/pipeline.py:367
+#: ceilometer/pipeline.py:368
 #, python-format
 msgid "Pipeline %(pipeline)s: Sample dropped by transformer %(trans)s"
 msgstr "流水线%(pipeline)s：数据点被变形器%(trans)s丢弃"
 
-#: ceilometer/pipeline.py:375
+#: ceilometer/pipeline.py:376
 #, python-format
 msgid ""
 "Pipeline %(pipeline)s: Exit after error from transformer %(trans)s for "
 "%(smp)s"
 msgstr "流水线%(pipeline)s：数据%(smp)s的变形器%(trans)s遇到错误，退出"
 
-#: ceilometer/pipeline.py:398
+#: ceilometer/pipeline.py:399
 #, python-format
 msgid "Pipeline %(pipeline)s: Transform sample %(smp)s from %(trans)s transformer"
 msgstr "流水线%(pipeline)s：使用变形器%(trans)s作用于数据%(smp)s "
 
-#: ceilometer/pipeline.py:428
+#: ceilometer/pipeline.py:429
 #, python-format
 msgid "Pipeline %(pipeline)s: Error flushing transformer %(trans)s"
 msgstr "流水线%(pipeline)s：变形器%(trans)s清空数据时出错"
 
-#: ceilometer/pipeline.py:624
+#: ceilometer/pipeline.py:625
 msgid "detected decoupled pipeline config format"
 msgstr "检测到分离的流水线配置格式"
 
-#: ceilometer/pipeline.py:645
+#: ceilometer/pipeline.py:646
 msgid "detected deprecated pipeline config format"
 msgstr "检测到废弃的流水线配置格式"
 
-#: ceilometer/pipeline.py:669
+#: ceilometer/pipeline.py:670
 #, python-format
 msgid "Pipeline config file: %s"
 msgstr "流水线配置文件：%s"
 
-#: ceilometer/pipeline.py:675
+#: ceilometer/pipeline.py:676
 #, python-format
 msgid "Pipeline config: %s"
 msgstr "流水线配置：%s"
@@ -119,27 +119,49 @@ msgstr "流水线配置：%s"
 msgid "%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
 msgstr "工作线程%(worker_name)s的数量%(workers)s非法，必须大于0"
 
-#: ceilometer/agent/base.py:127
+#: ceilometer/agent/base.py:130
 #, python-format
 msgid "Polling pollster %(poll)s in the context of %(src)s"
 msgstr "在上下文环境%(src)s执行采集器%(poll)s"
 
-#: ceilometer/agent/base.py:140
+#: ceilometer/agent/base.py:161
+#, python-format
+msgid ""
+"Found following duplicated resoures for %(name)s in context of "
+"%(source)s:%(list)s. Check pipeline configuration."
+msgstr ""
+
+#: ceilometer/agent/base.py:172
 #, python-format
 msgid "Skip polling pollster %s, no resources found"
 msgstr "没有任何资源被发现，跳过采集器%s"
 
-#: ceilometer/agent/base.py:152
+#: ceilometer/agent/base.py:184
+#, python-format
+msgid "Prevent pollster %(name)s for polling source %(source)s anymore!"
+msgstr ""
+
+#: ceilometer/agent/base.py:190
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "遇到错误%(name)s：%(error)s，继续执行"
 
-#: ceilometer/agent/base.py:298
+#: ceilometer/agent/base.py:244
+#, python-format
+msgid "Skip loading extension for %s"
+msgstr ""
+
+#: ceilometer/agent/base.py:248
+#, python-format
+msgid "Failed to import extension for %(name)s: %(error)s"
+msgstr ""
+
+#: ceilometer/agent/base.py:357
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr "无法发现资源：%s"
 
-#: ceilometer/agent/base.py:300
+#: ceilometer/agent/base.py:359
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr "未知的发现器插件：%s"
@@ -244,16 +266,62 @@ msgid "Remaining as %(state)s due to alarms %(alarm_ids)s in state %(state)s"
 msgstr "停留在状态%(state)s因为告警%(alarm_ids)s处于状态%(state)s"
 
 #: ceilometer/alarm/evaluator/combination.py:99
+#: ceilometer/alarm/evaluator/gnocchi.py:207
 #: ceilometer/alarm/evaluator/threshold.py:178
 #, python-format
 msgid "Attempted to evaluate alarm %s, but it is not within its time constraint."
 msgstr "尝试评估告警%s，但是该告警当前不在激活的时间范围内"
 
+#: ceilometer/alarm/evaluator/gnocchi.py:99
+#: ceilometer/alarm/evaluator/threshold.py:89
+#, python-format
+msgid "stats query %s"
+msgstr "统计信息查询 %s"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:103
+#: ceilometer/alarm/evaluator/threshold.py:95
+msgid "alarm stats retrieval failed"
+msgstr "警报统计信息获取失败"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:106
+#, python-format
+msgid "alarm stats retrieval failed: %s"
+msgstr ""
+
+#: ceilometer/alarm/evaluator/gnocchi.py:121
 #: ceilometer/alarm/evaluator/threshold.py:56
 #, python-format
 msgid "query stats from %(start)s to %(now)s"
 msgstr "查询 %(start)s 到 %(now)s 之间的统计信息"
 
+#: ceilometer/alarm/evaluator/gnocchi.py:133
+#: ceilometer/alarm/evaluator/threshold.py:112
+#, python-format
+msgid "%d datapoints are unknown"
+msgstr "%d 数据点为未知"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:156
+#: 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 "有%(count)d个数据满足%(disposition)s阈值，因而状态迁移到%(state)s，最近的一次数据：%(most_recent)s"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:160
+#: 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 "有%(count)d个数据满足%(disposition)s阈值，因而状态保持为%(state)s，最近的一次数据：%(most_recent)s"
+
+#: ceilometer/alarm/evaluator/gnocchi.py:219
+#: ceilometer/alarm/evaluator/threshold.py:197
+#, python-format
+msgid "comparing value %(value)s against threshold %(limit)s"
+msgstr "将值 %(value)s 与阈值 %(limit)s 相比较"
+
 #: ceilometer/alarm/evaluator/threshold.py:66
 #, python-format
 msgid "sanitize stats %s"
@@ -269,39 +337,6 @@ msgstr "排除%s个弱相关的数据"
 msgid "pruned statistics to %d"
 msgstr "裁剪统计信息到%d个"
 
-#: ceilometer/alarm/evaluator/threshold.py:89
-#, python-format
-msgid "stats query %s"
-msgstr "统计信息查询 %s"
-
-#: ceilometer/alarm/evaluator/threshold.py:95
-msgid "alarm stats retrieval failed"
-msgstr "警报统计信息获取失败"
-
-#: ceilometer/alarm/evaluator/threshold.py:112
-#, python-format
-msgid "%d datapoints are unknown"
-msgstr "%d 数据点为未知"
-
-#: 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 "有%(count)d个数据满足%(disposition)s阈值，因而状态迁移到%(state)s，最近的一次数据：%(most_recent)s"
-
-#: 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 "有%(count)d个数据满足%(disposition)s阈值，因而状态保持为%(state)s，最近的一次数据：%(most_recent)s"
-
-#: ceilometer/alarm/evaluator/threshold.py:197
-#, python-format
-msgid "comparing value %(value)s against threshold %(limit)s"
-msgstr "将值 %(value)s 与阈值 %(limit)s 相比较"
-
 #: ceilometer/alarm/notifier/log.py:30
 #, python-format
 msgid ""
@@ -468,21 +503,21 @@ msgstr "timestamp必须是datatime对象"
 msgid "state_timestamp should be datetime object"
 msgstr "state_timestamp必须是datetime对象"
 
-#: ceilometer/api/app.py:163
+#: ceilometer/api/app.py:136
 #, python-format
 msgid "Starting server in PID %s"
 msgstr "正在启动服务进程PID %s"
 
-#: ceilometer/api/app.py:164
+#: ceilometer/api/app.py:137
 msgid "Configuration:"
 msgstr "配置"
 
-#: ceilometer/api/app.py:168
+#: ceilometer/api/app.py:141
 #, python-format
 msgid "serving on 0.0.0.0:%(sport)s, view at http://127.0.0.1:%(vport)s"
 msgstr "服务在0.0.0.0:%(sport)s上运行，可以通过http://127.0.0.1:%(vport)s来查看"
 
-#: ceilometer/api/app.py:172
+#: ceilometer/api/app.py:145
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr "在 http://%(host)s:%(port)s上服务"
@@ -492,143 +527,122 @@ msgstr "在 http://%(host)s:%(port)s上服务"
 msgid "Error parsing HTTP response: %s"
 msgstr "解析HTTP响应失败: %s"
 
-#: ceilometer/api/controllers/v2/alarms.py:80
+#: ceilometer/api/controllers/v2/alarms.py:84
-#, python-format
-msgid "Alarm %s not found"
-msgstr "告警%s没有找到"
-
-#: ceilometer/api/controllers/v2/alarms.py:82
-#, python-format
-msgid "Alarm %(alarm_id)s not found in project %(project)s"
-msgstr "告警%(alarm_id)s在项目%(project)s中未找到"
-
-#: ceilometer/api/controllers/v2/alarms.py:95
 #, python-format
 msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
 msgstr "用户%(u)s在项目%(p)s中的告警配额已溢出"
 
-#: ceilometer/api/controllers/v2/alarms.py:207
+#: ceilometer/api/controllers/v2/alarms.py:166
-#, python-format
-msgid ""
-"Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
-"%(threshold)s over %(period)s seconds"
-msgstr ""
-
-#: ceilometer/api/controllers/v2/alarms.py:253
-#, python-format
-msgid "Combined state of alarms %s"
-msgstr "将告警%s的状态进行组合"
-
-#: ceilometer/api/controllers/v2/alarms.py:262
-msgid "Alarm combination rule should contain at least two different alarm ids."
-msgstr "告警组合规则必须包含至少两个不同的告警id"
-
-#: ceilometer/api/controllers/v2/alarms.py:283
-#, python-format
-msgid "Cannot specify alarm %s itself in combination rule"
-msgstr "无法在组合规则中指定告警%s自身"
-
-#: ceilometer/api/controllers/v2/alarms.py:333
 #, python-format
 msgid "Timezone %s is not valid"
 msgstr "时区%s不合法"
 
-#: ceilometer/api/controllers/v2/alarms.py:445
+#: ceilometer/api/controllers/v2/alarms.py:281
 msgid "Time constraint names must be unique for a given alarm."
 msgstr "一个指定的告警的时间约束名称必须唯一"
 
-#: ceilometer/api/controllers/v2/alarms.py:455
+#: ceilometer/api/controllers/v2/alarms.py:291
 #, python-format
 msgid "%(rule)s must be set for %(type)s type alarm"
 msgstr "类型为%(type)s的告警必须设置%(rule)s"
 
-#: ceilometer/api/controllers/v2/alarms.py:466
+#: ceilometer/api/controllers/v2/alarms.py:302
 #, python-format
 msgid "%(rule1)s and %(rule2)s cannot be set at the same time"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/alarms.py:483
+#: ceilometer/api/controllers/v2/alarms.py:319
 #, python-format
 msgid "Unable to parse action %s"
 msgstr "无法解析动作%s"
 
-#: ceilometer/api/controllers/v2/alarms.py:486
+#: ceilometer/api/controllers/v2/alarms.py:322
 #, python-format
 msgid "Unsupported action %s"
 msgstr "动作%s不支持"
 
-#: ceilometer/api/controllers/v2/alarms.py:670
+#: ceilometer/api/controllers/v2/alarms.py:509
 #, python-format
 msgid "Alarm with name=%s exists"
 msgstr "名称为%s的告警已存在"
 
-#: ceilometer/api/controllers/v2/alarms.py:680
+#: ceilometer/api/controllers/v2/alarms.py:519
 #, python-format
 msgid "Error while putting alarm: %s"
 msgstr "修改告警%s时遇到错误"
 
-#: ceilometer/api/controllers/v2/alarms.py:681
+#: ceilometer/api/controllers/v2/alarms.py:520
-#: ceilometer/api/controllers/v2/alarms.py:849
+#: ceilometer/api/controllers/v2/alarms.py:688
 msgid "Alarm incorrect"
 msgstr "警报不正确"
 
-#: ceilometer/api/controllers/v2/alarms.py:741
+#: ceilometer/api/controllers/v2/alarms.py:580
 msgid "state invalid"
 msgstr "状态无效"
 
-#: ceilometer/api/controllers/v2/alarms.py:842
+#: ceilometer/api/controllers/v2/alarms.py:681
 #, python-format
 msgid "Alarm with name='%s' exists"
 msgstr "名称为'%s'的告警已经存在"
 
-#: ceilometer/api/controllers/v2/alarms.py:848
+#: ceilometer/api/controllers/v2/alarms.py:687
 #, python-format
 msgid "Error while posting alarm: %s"
 msgstr "创建告警%s时遇到错误"
 
-#: ceilometer/api/controllers/v2/base.py:48
+#: ceilometer/api/controllers/v2/base.py:50
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "无法找到%(entity)s %(id)s "
 
-#: ceilometer/api/controllers/v2/base.py:57
+#: ceilometer/api/controllers/v2/base.py:59
 #, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:216
+#: ceilometer/api/controllers/v2/base.py:220
 #, python-format
 msgid "Unable to convert the value %(value)s to the expected data type %(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:221
+#: ceilometer/api/controllers/v2/base.py:225
 #, python-format
 msgid ""
 "The data type %(type)s is not supported. The supported data type list is:"
 " %(supported)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2/base.py:226
+#: ceilometer/api/controllers/v2/base.py:230
 #, python-format
 msgid ""
 "Unexpected exception converting %(value)s to the expected data type "
 "%(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2/events.py:168
+#: ceilometer/api/controllers/v2/base.py:240
+#, python-format
+msgid "Alarm %s not found"
+msgstr "告警%s没有找到"
+
+#: ceilometer/api/controllers/v2/base.py:242
+#, python-format
+msgid "Alarm %(alarm_id)s not found in project %(project)s"
+msgstr "告警%(alarm_id)s在项目%(project)s中未找到"
+
+#: ceilometer/api/controllers/v2/events.py:172
 msgid "operator {} is incorrect"
 msgstr "操作符{}不合法"
 
-#: ceilometer/api/controllers/v2/events.py:190
+#: ceilometer/api/controllers/v2/events.py:195
 #, python-format
 msgid "Getting traits for %s"
 msgstr "正在为%s获取特征"
 
-#: ceilometer/api/controllers/v2/events.py:260
+#: ceilometer/api/controllers/v2/events.py:266
 msgid "Event"
 msgstr "事件"
 
-#: ceilometer/api/controllers/v2/events.py:263
+#: ceilometer/api/controllers/v2/events.py:269
 #, python-format
 msgid "More than one event with id %s returned from storage driver"
 msgstr "从数据库返回了多个id为%s的事件"
@@ -692,6 +706,27 @@ msgstr "资源"
 msgid "Sample"
 msgstr "数据"
 
+#: ceilometer/api/controllers/v2/alarm_rules/combination.py:39
+#, python-format
+msgid "Combined state of alarms %s"
+msgstr "将告警%s的状态进行组合"
+
+#: ceilometer/api/controllers/v2/alarm_rules/combination.py:48
+msgid "Alarm combination rule should contain at least two different alarm ids."
+msgstr "告警组合规则必须包含至少两个不同的告警id"
+
+#: ceilometer/api/controllers/v2/alarm_rules/combination.py:69
+#, python-format
+msgid "Cannot specify alarm %s itself in combination rule"
+msgstr "无法在组合规则中指定告警%s自身"
+
+#: 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/cmd/storage.py:39
 msgid "Clearing expired metering data"
 msgstr "正在清除过期的监控数据"
@@ -725,10 +760,11 @@ msgstr "虚拟机%(instance)s的CPU时间为%(time)d"
 
 #: ceilometer/compute/pollsters/cpu.py:48
 #: ceilometer/compute/pollsters/cpu.py:79
-#: ceilometer/compute/pollsters/disk.py:125
+#: ceilometer/compute/pollsters/disk.py:131
-#: ceilometer/compute/pollsters/disk.py:335
+#: ceilometer/compute/pollsters/disk.py:341
-#: ceilometer/compute/pollsters/disk.py:517
+#: ceilometer/compute/pollsters/disk.py:523
-#: ceilometer/compute/pollsters/disk.py:598
+#: ceilometer/compute/pollsters/disk.py:604
+#: ceilometer/compute/pollsters/disk.py:699
 #: ceilometer/compute/pollsters/memory.py:47
 #: ceilometer/compute/pollsters/net.py:106
 #, python-format
@@ -765,28 +801,34 @@ msgstr "为%s获取CPU使用率尚未实现"
 msgid "Could not get CPU Util for %(id)s: %(e)s"
 msgstr "无法为虚拟机%(id)s获取CPU使用率：%(e)s"
 
-#: ceilometer/compute/pollsters/disk.py:133
+#: ceilometer/compute/pollsters/disk.py:139
-#: ceilometer/compute/pollsters/disk.py:338
+#: ceilometer/compute/pollsters/disk.py:344
-#: ceilometer/compute/pollsters/disk.py:520
+#: ceilometer/compute/pollsters/disk.py:526
+#: ceilometer/compute/pollsters/disk.py:707
 #: ceilometer/compute/pollsters/net.py:114
 #, python-format
 msgid "%(inspector)s does not provide data for  %(pollster)s"
 msgstr "探测器%(inspector)s没有为%(pollster)s提供数据"
 
-#: ceilometer/compute/pollsters/disk.py:138
+#: ceilometer/compute/pollsters/disk.py:144
-#: ceilometer/compute/pollsters/disk.py:344
+#: ceilometer/compute/pollsters/disk.py:350
-#: ceilometer/compute/pollsters/disk.py:526
+#: ceilometer/compute/pollsters/disk.py:532
-#: ceilometer/compute/pollsters/disk.py:607
+#: ceilometer/compute/pollsters/disk.py:613
 #: ceilometer/compute/pollsters/net.py:119
 #, python-format
 msgid "Ignoring instance %(name)s: %(error)s"
 msgstr "忽略虚拟机%(name)s：%(error)s"
 
-#: ceilometer/compute/pollsters/disk.py:601
+#: ceilometer/compute/pollsters/disk.py:607
 #, python-format
 msgid "%(inspector)s does not provide data for %(pollster)s"
 msgstr "%(inspector)s无法为采集器%(pollster)s提供数据"
 
+#: ceilometer/compute/pollsters/disk.py:713
+#, python-format
+msgid "Ignoring instance %(name)s (%(instance_id)s) : %(error)s"
+msgstr ""
+
 #: ceilometer/compute/pollsters/memory.py:31
 #, python-format
 msgid "Checking memory usage for instance %s"
@@ -812,7 +854,7 @@ msgstr "无法为%(id)s获取内存使用信息：%(e)s"
 msgid "checking net info for instance %s"
 msgstr "为虚拟机%s检查网络信息"
 
-#: ceilometer/compute/virt/inspector.py:262
+#: ceilometer/compute/virt/inspector.py:282
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "无法加载管理程序的探测器：%s"
@@ -839,9 +881,9 @@ msgstr "正在连接 libvirt：%s"
 #: ceilometer/compute/virt/libvirt/inspector.py:97
 #, python-format
 msgid ""
-"Error from libvirt while looking up instance <name=%(name)s, id=%(id)>: "
+"Error from libvirt while looking up instance <name=%(name)s, id=%(id)s>: "
 "[Error Code %(error_code)s] %(ex)s"
-msgstr "从libvirt查找虚拟机<name=%(name)s, id=%(id)>时出错：[错误码%(error_code)s] %(ex)s"
+msgstr ""
 
 #: ceilometer/compute/virt/libvirt/inspector.py:117
 #, python-format
@@ -951,65 +993,65 @@ msgstr "消息发送结束，状态码为%d"
 msgid "Kwapi endpoint not found"
 msgstr "Kwapi端点无法找到"
 
-#: ceilometer/event/converter.py:74
+#: ceilometer/event/converter.py:78
 #, python-format
 msgid "Plugin specified, but no plugin name supplied for trait %s"
 msgstr "特征%s指定了插件但是没有提供插件的名称"
 
-#: ceilometer/event/converter.py:83
+#: ceilometer/event/converter.py:87
 #, python-format
 msgid "No plugin named %(plugin)s available for trait %(trait)s"
 msgstr "特征%(trait)s缺少可用的名为%(plugin)s的插件"
 
-#: ceilometer/event/converter.py:93
+#: ceilometer/event/converter.py:97
 #, python-format
 msgid "Required field in trait definition not specified: '%s'"
 msgstr "在特征定义中的必填项没有填写：'%s'"
 
-#: ceilometer/event/converter.py:108
+#: ceilometer/event/converter.py:112
 #, python-format
 msgid ""
 "Parse error in JSONPath specification '%(jsonpath)s' for %(trait)s: "
 "%(err)s"
 msgstr ""
 
-#: ceilometer/event/converter.py:114
+#: ceilometer/event/converter.py:118
 #, python-format
 msgid "Invalid trait type '%(type)s' for trait %(trait)s"
 msgstr "特征%(trait)s包含了不合法的特征类型'%(type)s' "
 
-#: ceilometer/event/converter.py:166
+#: ceilometer/event/converter.py:171
 #, python-format
 msgid "Required field %s not specified"
 msgstr "必填项%s没有填写"
 
-#: ceilometer/event/converter.py:341
+#: ceilometer/event/converter.py:348
 #, python-format
 msgid "Dropping Notification %(type)s (uuid:%(msgid)s)"
 msgstr "正在丢弃通知%(type)s (uuid:%(msgid)s)"
 
-#: ceilometer/event/converter.py:365
+#: ceilometer/event/converter.py:372
 #, python-format
 msgid "Event Definitions configuration file: %s"
 msgstr "事件定义配置文件：%s"
 
-#: ceilometer/event/converter.py:375
+#: ceilometer/event/converter.py:382
 #, 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。"
 
-#: ceilometer/event/converter.py:381
+#: ceilometer/event/converter.py:388
 #, python-format
 msgid "YAML error reading Event Definitions file %(file)s"
 msgstr "读取事件定义文件%(file)s时遇到YAML错误"
 
-#: ceilometer/event/converter.py:388
+#: ceilometer/event/converter.py:395
 msgid "No Event Definitions configuration file found! Using default config."
 msgstr "没有找到事件定义配置文件！使用默认的配置。"
 
-#: ceilometer/event/converter.py:392
+#: ceilometer/event/converter.py:399
 #, python-format
 msgid "Event Definitions: %s"
 msgstr "事件定义：%s"
@@ -1018,29 +1060,20 @@ msgstr "事件定义：%s"
 msgid "Loading event definitions"
 msgstr "正在加载事件定义"
 
-#: ceilometer/event/storage/impl_hbase.py:123
+#: ceilometer/event/storage/impl_hbase.py:124
-#: ceilometer/event/storage/impl_sqlalchemy.py:200
+#: ceilometer/event/storage/impl_sqlalchemy.py:209
+#: ceilometer/event/storage/impl_sqlalchemy.py:213
 #: ceilometer/event/storage/pymongo_base.py:76
 #, python-format
 msgid "Failed to record event: %s"
 msgstr "无法记录事件：%s"
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:196
+#: ceilometer/event/storage/impl_sqlalchemy.py:205
 #: ceilometer/event/storage/pymongo_base.py:72
 #, python-format
 msgid "Failed to record duplicated event: %s"
 msgstr "无法记录重复的事件：%s"
 
-#: ceilometer/event/storage/impl_sqlalchemy.py:215
-#, python-format
-msgid "Getting events that match filter: %s"
-msgstr "正在获取符合过滤器：%s的事件"
-
-#: ceilometer/event/storage/impl_sqlalchemy.py:327
-#, python-format
-msgid "Get traits for %s"
-msgstr "为%s获取特征"
-
 #: ceilometer/hardware/discovery.py:74
 #, python-format
 msgid "Couldn't obtain IP address of instance %s"
@@ -1060,7 +1093,7 @@ msgstr ""
 msgid "Can NOT load inspector %(name)s: %(err)s"
 msgstr "无法加载探测器%(name)s: %(err)s"
 
-#: ceilometer/ipmi/platform/intel_node_manager.py:228
+#: ceilometer/ipmi/platform/intel_node_manager.py:297
 msgid "Node Manager init failed"
 msgstr "节点管理器初始化失败"
 
@@ -1084,6 +1117,21 @@ msgstr "ipmi输出长度不匹配"
 msgid "running ipmitool failure"
 msgstr "运行ipmitool时失败了"
 
+#: ceilometer/ipmi/pollsters/node.py:66
+#, python-format
+msgid "Polling %(name)s faild for %(cnt)s times!"
+msgstr ""
+
+#: ceilometer/ipmi/pollsters/node.py:71 ceilometer/ipmi/pollsters/sensor.py:74
+#, python-format
+msgid "Pollster for %s is disabled!"
+msgstr ""
+
+#: ceilometer/ipmi/pollsters/sensor.py:68
+#, python-format
+msgid "Polling %(mtr)s sensor failed for %(cnt)s times!"
+msgstr ""
+
 #: ceilometer/network/floatingip.py:54
 #, python-format
 msgid "FLOATING IP USAGE: %s"
@@ -1139,6 +1187,15 @@ msgstr "OpenDaylight接口返回状态%(status)s，原因%(reason)s"
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr "请求无法连接到OpenDaylight的北向REST接口"
 
+#: ceilometer/objectstore/rgw.py:80
+msgid "Radosgw endpoint not found"
+msgstr ""
+
+#: ceilometer/objectstore/rgw_client.py:48
+#, python-format
+msgid "RGW AdminOps API returned %(status)s %(reason)s"
+msgstr ""
+
 #: ceilometer/objectstore/swift.py:76
 msgid "Swift endpoint not found"
 msgstr "Swift端点无法找到"
@@ -1165,32 +1222,6 @@ msgstr "系统日志工具必须是下列其中一项：%s"
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "对建议不要使用的配置进行了后果极严重的调用：%(msg)s"
 
-#: ceilometer/openstack/common/policy.py:111
-msgid "The JSON file that defines policies."
-msgstr "定义策略的JSON文件。"
-
-#: ceilometer/openstack/common/policy.py:114
-msgid "Default rule. Enforced when a requested rule is not found."
-msgstr "默认规则。当一个请求的规则没有找到时强制使用的规则。"
-
-#: ceilometer/openstack/common/policy.py:118
-msgid ""
-"Directories where policy configuration files are stored. They can be "
-"relative to any directory in the search path defined by the config_dir "
-"option, or absolute paths. The file defined by policy_file must exist for"
-" these directories to be searched."
-msgstr ""
-
-#: ceilometer/openstack/common/policy.py:142
-#, python-format
-msgid "Policy doesn't allow %s to be performed."
-msgstr "策略不允许 %s 被执行。"
-
-#: ceilometer/openstack/common/policy.py:239
-#, python-format
-msgid "Rules must be an instance of dict or Rules, got %s instead"
-msgstr "规则必须是字典或者规则的实例化对像，获取 %s 取代"
-
 #: ceilometer/openstack/common/versionutils.py:99
 #, python-format
 msgid ""
@@ -1257,7 +1288,7 @@ msgstr "通过UDP发布采样 %(msg)s 至 %(host)s:%(port)d"
 msgid "Unable to send sample over UDP"
 msgstr "无法通过UDP发送采样"
 
-#: ceilometer/storage/__init__.py:114
+#: ceilometer/storage/__init__.py:126
 #, python-format
 msgid "looking for %(name)r driver in %(namespace)r"
 msgstr "正在名字空间%(namespace)r查找驱动%(name)r "
@@ -1292,16 +1323,20 @@ msgid ""
 "feature and going in background."
 msgstr "MongoDB正在后台使用原生的TTL机制清除过期监控数据。"
 
-#: ceilometer/storage/impl_sqlalchemy.py:308
+#: ceilometer/storage/impl_sqlalchemy.py:306
 #, python-format
 msgid "Unknown metadata type. Key (%s) will not be queryable."
 msgstr "未知的元数据类型。键(%s)将无法进行查询。"
 
-#: ceilometer/storage/impl_sqlalchemy.py:361
+#: ceilometer/storage/impl_sqlalchemy.py:359
 #, python-format
 msgid "%d samples removed from database"
 msgstr "从数据库中移除%d个监控数据。"
 
+#: ceilometer/storage/impl_sqlalchemy.py:378
+msgid "Expired residual resource and meter definition data"
+msgstr ""
+
 #: ceilometer/storage/hbase/base.py:45
 msgid "Creating a new in-memory HBase Connection object"
 msgstr "正在创建一个新的内存HBase连接对象。"