Imported Translations from Transifex

Change-Id: I25df9cf375e981d5b9fb81fbb2841ec35bc59730

8 files changed, 645 insertions, 339 deletions

diff --git a/ceilometer/locale/ceilometer-log-warning.pot b/ceilometer/locale/ceilometer-log-warning.pot
index eefa0545..562d025d 100644
--- a/ceilometer/locale/ceilometer-log-warning.pot
+++ b/ceilometer/locale/ceilometer-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2014.2.dev169.g9abd9ac\n"
+"Project-Id-Version: ceilometer 2014.2.dev66.gc369645\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-02 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:05+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,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
+#: ceilometer/central/discovery.py:46
+#, python-format
+msgid "No endpoints found for service %s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:87
 #, python-format
 msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
diff --git a/ceilometer/locale/ceilometer.pot b/ceilometer/locale/ceilometer.pot
index 0b1723ab..c33115aa 100644
--- a/ceilometer/locale/ceilometer.pot
+++ b/ceilometer/locale/ceilometer.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ceilometer 2014.2.dev169.g9abd9ac\n"
+"Project-Id-Version: ceilometer 2014.2.dev66.gc369645\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-02 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:05+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,22 +17,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: ceilometer/agent.py:85
+#: ceilometer/agent.py:92
 #, python-format
 msgid "Polling pollster %s"
 msgstr ""
 
-#: ceilometer/agent.py:95
+#: ceilometer/agent.py:108
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/agent.py:171
+#: ceilometer/agent.py:215
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr ""
 
-#: ceilometer/agent.py:173
+#: ceilometer/agent.py:217
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr ""
@@ -134,53 +134,53 @@ msgstr ""
 msgid "%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
 msgstr ""
 
-#: ceilometer/alarm/rpc.py:53
+#: ceilometer/alarm/rpc.py:56
 #, python-format
 msgid ""
 "alarm %(alarm_id)s has no action configured for state transition from "
 "%(previous)s to state %(state)s, skipping the notification."
 msgstr ""
 
-#: ceilometer/alarm/service.py:90
+#: ceilometer/alarm/service.py:93
 #, python-format
 msgid "initiating evaluation cycle on %d alarms"
 msgstr ""
 
-#: ceilometer/alarm/service.py:95
+#: ceilometer/alarm/service.py:98
 msgid "alarm evaluation cycle failed"
 msgstr ""
 
-#: ceilometer/alarm/service.py:100
+#: ceilometer/alarm/service.py:103
 #, python-format
 msgid "skipping alarm %s: type unsupported"
 msgstr ""
 
-#: ceilometer/alarm/service.py:104
+#: ceilometer/alarm/service.py:107
 #, python-format
 msgid "evaluating alarm %s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:216
+#: ceilometer/alarm/service.py:261
 #, python-format
 msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:225
+#: ceilometer/alarm/service.py:270
 #, python-format
 msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
 msgstr ""
 
-#: ceilometer/alarm/service.py:231
+#: ceilometer/alarm/service.py:276
 #, python-format
 msgid "Notifying alarm %(id)s with action %(act)s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:236
+#: ceilometer/alarm/service.py:281
 #, python-format
 msgid "Unable to notify alarm %s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:255
+#: ceilometer/alarm/service.py:300
 msgid "Unable to notify for an alarm with no action"
 msgstr ""
 
@@ -408,47 +408,47 @@ msgstr ""
 msgid "assignment retrieval failed"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:91
-#: ceilometer/storage/impl_hbase.py:154
+#: ceilometer/alarm/storage/impl_hbase.py:92
+#: ceilometer/storage/impl_hbase.py:155
 msgid "Creating a new in-memory HBase Connection object"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:105
-#: ceilometer/storage/impl_hbase.py:169
+#: ceilometer/alarm/storage/impl_hbase.py:107
+#: ceilometer/storage/impl_hbase.py:170
 msgid "Dropping HBase schema..."
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:112
-#: ceilometer/storage/impl_hbase.py:177
+#: ceilometer/alarm/storage/impl_hbase.py:114
+#: ceilometer/storage/impl_hbase.py:178
 msgid "Cannot disable table but ignoring error"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:116
-#: ceilometer/storage/impl_hbase.py:181
+#: ceilometer/alarm/storage/impl_hbase.py:118
+#: ceilometer/storage/impl_hbase.py:182
 msgid "Cannot delete table but ignoring error"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:127
-#: ceilometer/storage/impl_hbase.py:192
+#: ceilometer/alarm/storage/impl_hbase.py:129
+#: ceilometer/storage/impl_hbase.py:193
 #, python-format
 msgid "connecting to HBase on %(host)s:%(port)s"
 msgstr ""
 
-#: ceilometer/api/app.py:154
+#: ceilometer/api/app.py:163
 #, python-format
 msgid "Starting server in PID %s"
 msgstr ""
 
-#: ceilometer/api/app.py:155
+#: ceilometer/api/app.py:164
 msgid "Configuration:"
 msgstr ""
 
-#: ceilometer/api/app.py:159
+#: ceilometer/api/app.py:168
 #, 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:163
+#: ceilometer/api/app.py:172
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr ""
@@ -458,185 +458,206 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:94
+#: ceilometer/api/controllers/v2.py:97
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:102
+#: ceilometer/api/controllers/v2.py:105
 #, python-format
 msgid "Alarm %s not found"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:104
+#: ceilometer/api/controllers/v2.py:107
 #, python-format
 msgid "Alarm %(alarm_id)s not found in project %(project)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:117
+#: ceilometer/api/controllers/v2.py:120
 #, python-format
 msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:310
+#: ceilometer/api/controllers/v2.py:313
 #, python-format
 msgid "Unable to convert the value %(value)s to the expected data type %(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:315
+#: ceilometer/api/controllers/v2.py:318
 #, python-format
 msgid ""
 "The data type %(type)s is not supported. The supported data type list is:"
 " %(supported)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:320
+#: ceilometer/api/controllers/v2.py:323
 #, python-format
 msgid ""
 "Unexpected exception converting %(value)s to the expected data type "
 "%(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:331
+#: ceilometer/api/controllers/v2.py:334
 #, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:804
+#: ceilometer/api/controllers/v2.py:809
 msgid "clamping min timestamp to range"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:809
+#: ceilometer/api/controllers/v2.py:814
 msgid "clamping max timestamp to range"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:885 ceilometer/api/controllers/v2.py:1151
+#: ceilometer/api/controllers/v2.py:890 ceilometer/api/controllers/v2.py:1156
 msgid "Limit must be positive"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:968
+#: ceilometer/api/controllers/v2.py:973
 msgid "Period must be positive."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:980
+#: ceilometer/api/controllers/v2.py:985
 #, python-format
 msgid "computed value coming from %r"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1167
+#: ceilometer/api/controllers/v2.py:1172
 msgid "Sample"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1350
+#: ceilometer/api/controllers/v2.py:1337
+#, python-format
+msgid "Filter expression not valid: %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1352
+#, python-format
+msgid "Order-by expression not valid: %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1363
 msgid "Limit should be positive"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1443
+#: ceilometer/api/controllers/v2.py:1456
 #, python-format
 msgid "String %s is not a valid isotime"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1444
+#: ceilometer/api/controllers/v2.py:1457
 #, python-format
 msgid "Failed to parse the timestamp value %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1530
+#: ceilometer/api/controllers/v2.py:1543
 msgid "Resource"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1605
+#: ceilometer/api/controllers/v2.py:1618
 #, 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.py:1645
+#: ceilometer/api/controllers/v2.py:1658
 #, python-format
 msgid "Combined state of alarms %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1654
+#: ceilometer/api/controllers/v2.py:1667
 msgid "Alarm combination rule should contain at least two different alarm ids."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1705
+#: ceilometer/api/controllers/v2.py:1718
 #, python-format
 msgid "Timezone %s is not valid"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1830
+#: ceilometer/api/controllers/v2.py:1844
 msgid "Time constraint names must be unique for a given alarm."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1840
+#: ceilometer/api/controllers/v2.py:1854
 #, python-format
 msgid "%(rule)s must be set for %(type)s type alarm"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1844
+#: ceilometer/api/controllers/v2.py:1858
 msgid "threshold_rule and combination_rule cannot be set at the same time"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2008
+#: ceilometer/api/controllers/v2.py:1875
+#, python-format
+msgid "Unable to parse action %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1878
+#, python-format
+msgid "Unsupported action %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:2041
 #, python-format
 msgid "Alarm with name=%s exists"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2015
+#: ceilometer/api/controllers/v2.py:2048
 #, python-format
 msgid "Cannot specify alarm %s itself in combination rule"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2023
+#: ceilometer/api/controllers/v2.py:2056
 #, python-format
 msgid "Error while putting alarm: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2024 ceilometer/api/controllers/v2.py:2175
+#: ceilometer/api/controllers/v2.py:2057 ceilometer/api/controllers/v2.py:2208
 msgid "Alarm incorrect"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2075
+#: ceilometer/api/controllers/v2.py:2108
 msgid "state invalid"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2168
+#: ceilometer/api/controllers/v2.py:2201
 #, python-format
 msgid "Alarm with name='%s' exists"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2174
+#: ceilometer/api/controllers/v2.py:2207
 #, python-format
 msgid "Error while posting alarm: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2327
+#: ceilometer/api/controllers/v2.py:2364
 msgid "operator {} is incorrect"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2349
+#: ceilometer/api/controllers/v2.py:2386
 #, python-format
 msgid "Getting traits for %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2414
+#: ceilometer/api/controllers/v2.py:2451
 msgid "Event"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2417
+#: ceilometer/api/controllers/v2.py:2454
 #, python-format
 msgid "More than one event with id %s returned from storage driver"
 msgstr ""
 
-#: ceilometer/central/plugin.py:49
+#: ceilometer/central/plugin.py:66
 #, python-format
 msgid "Skip due to keystone error %s"
 msgstr ""
 
-#: ceilometer/central/plugin.py:55
-msgid "Skipping because service is notregistered in keystone"
+#: ceilometer/central/plugin.py:73
+#, python-format
+msgid "Skipping because %s service is not registered in keystone"
 msgstr ""
 
 #: ceilometer/cmd/storage.py:39
@@ -693,10 +714,10 @@ msgstr ""
 
 #: ceilometer/compute/pollsters/cpu.py:52
 #: ceilometer/compute/pollsters/cpu.py:83
-#: ceilometer/compute/pollsters/disk.py:121
-#: ceilometer/compute/pollsters/disk.py:326
+#: ceilometer/compute/pollsters/disk.py:122
+#: ceilometer/compute/pollsters/disk.py:327
 #: ceilometer/compute/pollsters/memory.py:47
-#: ceilometer/compute/pollsters/net.py:106
+#: ceilometer/compute/pollsters/net.py:107
 #, python-format
 msgid "Exception while getting samples %s"
 msgstr ""
@@ -731,16 +752,16 @@ msgstr ""
 msgid "Could not get CPU Util for %(id)s: %(e)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:124
-#: ceilometer/compute/pollsters/disk.py:329
-#: ceilometer/compute/pollsters/net.py:109
+#: ceilometer/compute/pollsters/disk.py:125
+#: ceilometer/compute/pollsters/disk.py:330
+#: ceilometer/compute/pollsters/net.py:110
 #, python-format
 msgid "%(inspector)s does not provide data for  %(pollster)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:129
-#: ceilometer/compute/pollsters/disk.py:335
-#: ceilometer/compute/pollsters/net.py:114
+#: ceilometer/compute/pollsters/disk.py:130
+#: ceilometer/compute/pollsters/disk.py:336
+#: ceilometer/compute/pollsters/net.py:115
 #, python-format
 msgid "Ignoring instance %(name)s: %(error)s"
 msgstr ""
@@ -765,12 +786,12 @@ msgstr ""
 msgid "Could not get Memory Usage for %(id)s: %(e)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/net.py:92
+#: ceilometer/compute/pollsters/net.py:93
 #, python-format
 msgid "checking net info for instance %s"
 msgstr ""
 
-#: ceilometer/compute/virt/inspector.py:230
+#: ceilometer/compute/virt/inspector.py:231
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr ""
@@ -866,7 +887,7 @@ msgstr ""
 msgid "message signature invalid, discarding message: %r"
 msgstr ""
 
-#: ceilometer/energy/kwapi.py:78
+#: ceilometer/energy/kwapi.py:89
 msgid "Kwapi endpoint not found"
 msgstr ""
 
@@ -933,35 +954,63 @@ msgstr ""
 msgid "Event Definitions: %s"
 msgstr ""
 
-#: ceilometer/event/endpoint.py:37
+#: ceilometer/event/endpoint.py:38
 msgid "Loading event definitions"
 msgstr ""
 
-#: ceilometer/event/endpoint.py:63
+#: ceilometer/event/endpoint.py:64
 #, python-format
 msgid "Saving event \"%s\""
 msgstr ""
 
-#: ceilometer/event/endpoint.py:70
+#: ceilometer/event/endpoint.py:71
 msgid "Event is not implemented with the storage backend"
 msgstr ""
 
-#: ceilometer/hardware/discovery.py:59
+#: ceilometer/hardware/discovery.py:73
 #, python-format
 msgid "Couldn't obtain IP address ofinstance %s"
 msgstr ""
 
-#: ceilometer/hardware/plugin.py:73
+#: ceilometer/hardware/plugin.py:66
+msgid "Passed resource dict must contain keys resource_id and resource_url."
+msgstr ""
+
+#: ceilometer/hardware/plugin.py:108
 #, python-format
 msgid "inspector call failed for %(ident)s host %(host)s: %(err)s"
 msgstr ""
 
-#: ceilometer/hardware/plugin.py:104
+#: ceilometer/hardware/plugin.py:139
 #, python-format
 msgid "Can NOT load inspector %(name)s: %(err)s"
 msgstr ""
 
-#: ceilometer/network/floatingip.py:45
+#: ceilometer/ipmi/platform/intel_node_manager.py:229
+msgid "Node Manager init failed"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmi_sensor.py:103
+msgid "Wrong sensor type"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:42
+msgid "parse IPMI sensor data failed,unknown sensor type"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:83
+msgid "parse IPMI sensor data failed,No data retrieved from given input"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:105
+msgid "ipmitool output length mismatch"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:128
+msgid "running ipmitool failure"
+msgstr ""
+
+#: ceilometer/network/floatingip.py:57
 #, python-format
 msgid "FLOATING IP USAGE: %s"
 msgstr ""
@@ -971,32 +1020,32 @@ msgstr ""
 msgid "network notification %r"
 msgstr ""
 
-#: ceilometer/network/services/fwaas.py:45
+#: ceilometer/network/services/fwaas.py:49
 #, python-format
 msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:61
+#: ceilometer/network/services/lbaas.py:64
 #, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:105
+#: ceilometer/network/services/lbaas.py:112
 #, python-format
 msgid "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:142
+#: ceilometer/network/services/lbaas.py:153
 #, python-format
 msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:240
+#: ceilometer/network/services/lbaas.py:258
 #, python-format
 msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr ""
 
-#: ceilometer/network/services/vpnaas.py:46
+#: ceilometer/network/services/vpnaas.py:50
 #, python-format
 msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
 msgstr ""
@@ -1017,7 +1066,7 @@ msgstr ""
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr ""
 
-#: ceilometer/objectstore/swift.py:69
+#: ceilometer/objectstore/swift.py:77
 msgid "Swift endpoint not found"
 msgstr ""
 
@@ -1074,17 +1123,58 @@ msgstr ""
 msgid "Rules must be an instance of dict or Rules, got %s instead"
 msgstr ""
 
-#: ceilometer/openstack/common/strutils.py:114
+#: ceilometer/openstack/common/processutils.py:59
+msgid "Unexpected error while running command."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:62
+#, python-format
+msgid ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:143
+#, python-format
+msgid "Got unknown keyword args: %r"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:148
+msgid "Command requested root, but did not specify a root helper."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:158
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:206
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:247
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:251
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: ceilometer/openstack/common/strutils.py:125
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
-#: ceilometer/openstack/common/strutils.py:219
+#: ceilometer/openstack/common/strutils.py:230
 #, python-format
 msgid "Invalid unit system: \"%s\""
 msgstr ""
 
-#: ceilometer/openstack/common/strutils.py:228
+#: ceilometer/openstack/common/strutils.py:239
 #, python-format
 msgid "Invalid string format: %s"
 msgstr ""
@@ -1141,23 +1231,23 @@ msgstr ""
 msgid "looking for %(name)r driver in %(namespace)r"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:291 ceilometer/storage/impl_hbase.py:340
+#: ceilometer/storage/impl_hbase.py:292 ceilometer/storage/impl_hbase.py:342
 #, python-format
 msgid "Query Resource table: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:333
+#: ceilometer/storage/impl_hbase.py:335
 msgid "Pagination not implemented"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:381
+#: ceilometer/storage/impl_hbase.py:383
 #, python-format
 msgid "Query Meter Table: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:528
-#: ceilometer/storage/impl_sqlalchemy.py:722
-#: ceilometer/storage/pymongo_base.py:143
+#: ceilometer/storage/impl_hbase.py:531
+#: ceilometer/storage/impl_sqlalchemy.py:812
+#: ceilometer/storage/pymongo_base.py:144
 #, python-format
 msgid "Failed to record event: %s"
 msgstr ""
@@ -1172,36 +1262,41 @@ msgstr ""
 msgid "Dropping data with TTL %d"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:283
+#: ceilometer/storage/impl_sqlalchemy.py:308
 #, python-format
 msgid "Unknown metadata type. Key (%s) will not be queryable."
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:315
+#: ceilometer/storage/impl_sqlalchemy.py:376
 #, python-format
 msgid "%d samples removed from database"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:718
-#: ceilometer/storage/pymongo_base.py:139
+#: ceilometer/storage/impl_sqlalchemy.py:808
+#: ceilometer/storage/pymongo_base.py:140
 #, python-format
 msgid "Failed to record duplicated event: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:737
+#: ceilometer/storage/impl_sqlalchemy.py:827
 #, python-format
 msgid "Getting events that match filter: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:848
+#: ceilometer/storage/impl_sqlalchemy.py:938
 #, python-format
 msgid "Get traits for %s"
 msgstr ""
 
-#: ceilometer/storage/hbase/inmemory.py:257
+#: ceilometer/storage/hbase/inmemory.py:261
 msgid "Opening in-memory HBase connection"
 msgstr ""
 
+#: ceilometer/storage/hbase/utils.py:439
+#, python-format
+msgid "Cannot create table %(table_name)s   it already exists. Ignoring error"
+msgstr ""
+
 #: ceilometer/storage/mongo/utils.py:175
 #, python-format
 msgid "Connecting to %(db)s on %(nodelist)s"
diff --git a/ceilometer/locale/de/LC_MESSAGES/ceilometer-log-warning.po b/ceilometer/locale/de/LC_MESSAGES/ceilometer-log-warning.po
index 55b88ac4..b2047af8 100644
--- a/ceilometer/locale/de/LC_MESSAGES/ceilometer-log-warning.po
+++ b/ceilometer/locale/de/LC_MESSAGES/ceilometer-log-warning.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-02 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:05+0000\n"
 "PO-Revision-Date: 2014-06-14 19:30+0000\n"
 "Last-Translator: Andreas Jaeger <jaegerandi@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/ceilometer/"
@@ -20,6 +20,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ceilometer/central/discovery.py:46
+#, python-format
+msgid "No endpoints found for service %s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:87
 #, python-format
 msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
diff --git a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po
index 54dafb33..f6d2e81c 100644
--- a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po
+++ b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer-log-warning.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-02 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:05+0000\n"
 "PO-Revision-Date: 2014-08-27 12:47+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -20,6 +20,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ceilometer/central/discovery.py:46
+#, python-format
+msgid "No endpoints found for service %s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:87
 #, python-format
 msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
diff --git a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
index 7926305f..9b76a278 100644
--- a/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/en_GB/LC_MESSAGES/ceilometer.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-09 06:08+0000\n"
-"PO-Revision-Date: 2014-09-02 10:01+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"POT-Creation-Date: 2014-09-24 06:05+0000\n"
+"PO-Revision-Date: 2014-09-20 23:19+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"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -19,22 +19,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: ceilometer/agent.py:91
+#: ceilometer/agent.py:92
 #, python-format
 msgid "Polling pollster %s"
 msgstr "Polling pollster %s"
 
-#: ceilometer/agent.py:101
+#: ceilometer/agent.py:108
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr "Continue after error from %(name)s: %(error)s"
 
-#: ceilometer/agent.py:203
+#: ceilometer/agent.py:215
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr "Unable to discover resources: %s"
 
-#: ceilometer/agent.py:205
+#: ceilometer/agent.py:217
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr "Unknown discovery extension: %s"
@@ -170,27 +170,27 @@ msgstr "skipping alarm %s: type unsupported"
 msgid "evaluating alarm %s"
 msgstr "evaluating alarm %s"
 
-#: ceilometer/alarm/service.py:259
+#: ceilometer/alarm/service.py:261
 #, python-format
 msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
 msgstr "Unable to parse action %(action)s for alarm %(alarm_id)s"
 
-#: ceilometer/alarm/service.py:268
+#: ceilometer/alarm/service.py:270
 #, python-format
 msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
 msgstr "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
 
-#: ceilometer/alarm/service.py:274
+#: ceilometer/alarm/service.py:276
 #, python-format
 msgid "Notifying alarm %(id)s with action %(act)s"
 msgstr "Notifying alarm %(id)s with action %(act)s"
 
-#: ceilometer/alarm/service.py:279
+#: ceilometer/alarm/service.py:281
 #, python-format
 msgid "Unable to notify alarm %s"
 msgstr "Unable to notify alarm %s"
 
-#: ceilometer/alarm/service.py:298
+#: ceilometer/alarm/service.py:300
 msgid "Unable to notify for an alarm with no action"
 msgstr "Unable to notify for an alarm with no action"
 
@@ -428,47 +428,47 @@ msgstr "%(this)s alarms for evaluation: %(alarms)s"
 msgid "assignment retrieval failed"
 msgstr "assignment retrieval failed"
 
-#: ceilometer/alarm/storage/impl_hbase.py:91
-#: ceilometer/storage/impl_hbase.py:154
+#: ceilometer/alarm/storage/impl_hbase.py:92
+#: ceilometer/storage/impl_hbase.py:155
 msgid "Creating a new in-memory HBase Connection object"
 msgstr "Creating a new in-memory HBase Connection object"
 
-#: ceilometer/alarm/storage/impl_hbase.py:105
-#: ceilometer/storage/impl_hbase.py:169
+#: ceilometer/alarm/storage/impl_hbase.py:107
+#: ceilometer/storage/impl_hbase.py:170
 msgid "Dropping HBase schema..."
 msgstr "Dropping HBase schema..."
 
-#: ceilometer/alarm/storage/impl_hbase.py:112
-#: ceilometer/storage/impl_hbase.py:177
+#: ceilometer/alarm/storage/impl_hbase.py:114
+#: ceilometer/storage/impl_hbase.py:178
 msgid "Cannot disable table but ignoring error"
 msgstr "Cannot disable table but ignoring error"
 
-#: ceilometer/alarm/storage/impl_hbase.py:116
-#: ceilometer/storage/impl_hbase.py:181
+#: ceilometer/alarm/storage/impl_hbase.py:118
+#: ceilometer/storage/impl_hbase.py:182
 msgid "Cannot delete table but ignoring error"
 msgstr "Cannot delete table but ignoring error"
 
-#: ceilometer/alarm/storage/impl_hbase.py:127
-#: ceilometer/storage/impl_hbase.py:192
+#: ceilometer/alarm/storage/impl_hbase.py:129
+#: ceilometer/storage/impl_hbase.py:193
 #, python-format
 msgid "connecting to HBase on %(host)s:%(port)s"
 msgstr "connecting to HBase on %(host)s:%(port)s"
 
-#: ceilometer/api/app.py:154
+#: ceilometer/api/app.py:163
 #, python-format
 msgid "Starting server in PID %s"
 msgstr "Starting server in PID %s"
 
-#: ceilometer/api/app.py:155
+#: ceilometer/api/app.py:164
 msgid "Configuration:"
 msgstr "Configuration:"
 
-#: ceilometer/api/app.py:159
+#: ceilometer/api/app.py:168
 #, 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:163
+#: ceilometer/api/app.py:172
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr "serving on http://%(host)s:%(port)s"
@@ -478,32 +478,32 @@ msgstr "serving on http://%(host)s:%(port)s"
 msgid "Error parsing HTTP response: %s"
 msgstr "Error parsing HTTP response: %s"
 
-#: ceilometer/api/controllers/v2.py:94
+#: ceilometer/api/controllers/v2.py:97
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr "%(entity)s %(id)s Not Found"
 
-#: ceilometer/api/controllers/v2.py:102
+#: ceilometer/api/controllers/v2.py:105
 #, python-format
 msgid "Alarm %s not found"
 msgstr "Alarm %s not found"
 
-#: ceilometer/api/controllers/v2.py:104
+#: ceilometer/api/controllers/v2.py:107
 #, 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.py:117
+#: ceilometer/api/controllers/v2.py:120
 #, 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.py:310
+#: ceilometer/api/controllers/v2.py:313
 #, 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.py:315
+#: ceilometer/api/controllers/v2.py:318
 #, python-format
 msgid ""
 "The data type %(type)s is not supported. The supported data type list is:"
@@ -512,7 +512,7 @@ msgstr ""
 "The data type %(type)s is not supported. The supported data type list is:"
 " %(supported)s"
 
-#: ceilometer/api/controllers/v2.py:320
+#: ceilometer/api/controllers/v2.py:323
 #, python-format
 msgid ""
 "Unexpected exception converting %(value)s to the expected data type "
@@ -521,55 +521,65 @@ msgstr ""
 "Unexpected exception converting %(value)s to the expected data type "
 "%(type)s."
 
-#: ceilometer/api/controllers/v2.py:331
+#: ceilometer/api/controllers/v2.py:334
 #, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
 msgstr "Not Authorised to access %(aspect)s %(id)s"
 
-#: ceilometer/api/controllers/v2.py:804
+#: ceilometer/api/controllers/v2.py:809
 msgid "clamping min timestamp to range"
 msgstr "clamping min timestamp to range"
 
-#: ceilometer/api/controllers/v2.py:809
+#: ceilometer/api/controllers/v2.py:814
 msgid "clamping max timestamp to range"
 msgstr "clamping max timestamp to range"
 
-#: ceilometer/api/controllers/v2.py:885 ceilometer/api/controllers/v2.py:1151
+#: ceilometer/api/controllers/v2.py:890 ceilometer/api/controllers/v2.py:1156
 msgid "Limit must be positive"
 msgstr "Limit must be positive"
 
-#: ceilometer/api/controllers/v2.py:968
+#: ceilometer/api/controllers/v2.py:973
 msgid "Period must be positive."
 msgstr "Period must be positive."
 
-#: ceilometer/api/controllers/v2.py:980
+#: ceilometer/api/controllers/v2.py:985
 #, python-format
 msgid "computed value coming from %r"
 msgstr "computed value coming from %r"
 
-#: ceilometer/api/controllers/v2.py:1167
+#: ceilometer/api/controllers/v2.py:1172
 msgid "Sample"
 msgstr "Sample"
 
-#: ceilometer/api/controllers/v2.py:1350
+#: ceilometer/api/controllers/v2.py:1337
+#, python-format
+msgid "Filter expression not valid: %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1352
+#, python-format
+msgid "Order-by expression not valid: %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1363
 msgid "Limit should be positive"
 msgstr "Limit should be positive"
 
-#: ceilometer/api/controllers/v2.py:1443
+#: ceilometer/api/controllers/v2.py:1456
 #, python-format
 msgid "String %s is not a valid isotime"
 msgstr "String %s is not a valid isotime"
 
-#: ceilometer/api/controllers/v2.py:1444
+#: ceilometer/api/controllers/v2.py:1457
 #, python-format
 msgid "Failed to parse the timestamp value %s"
 msgstr "Failed to parse the timestamp value %s"
 
-#: ceilometer/api/controllers/v2.py:1530
+#: ceilometer/api/controllers/v2.py:1543
 msgid "Resource"
 msgstr "Resource"
 
-#: ceilometer/api/controllers/v2.py:1605
+#: ceilometer/api/controllers/v2.py:1618
 #, python-format
 msgid ""
 "Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
@@ -578,92 +588,103 @@ msgstr ""
 "Alarm when %(meter_name)s is %(comparison_operator)s a %(statistic)s of "
 "%(threshold)s over %(period)s seconds"
 
-#: ceilometer/api/controllers/v2.py:1645
+#: ceilometer/api/controllers/v2.py:1658
 #, python-format
 msgid "Combined state of alarms %s"
 msgstr "Combined state of alarms %s"
 
-#: ceilometer/api/controllers/v2.py:1654
+#: ceilometer/api/controllers/v2.py:1667
 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.py:1705
+#: ceilometer/api/controllers/v2.py:1718
 #, python-format
 msgid "Timezone %s is not valid"
 msgstr "Timezone %s is not valid"
 
-#: ceilometer/api/controllers/v2.py:1830
+#: ceilometer/api/controllers/v2.py:1844
 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.py:1840
+#: ceilometer/api/controllers/v2.py:1854
 #, 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.py:1844
+#: ceilometer/api/controllers/v2.py:1858
 msgid "threshold_rule and combination_rule cannot be set at the same time"
 msgstr "threshold_rule and combination_rule cannot be set at the same time"
 
-#: ceilometer/api/controllers/v2.py:2008
+#: ceilometer/api/controllers/v2.py:1875
+#, python-format
+msgid "Unable to parse action %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1878
+#, python-format
+msgid "Unsupported action %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:2041
 #, python-format
 msgid "Alarm with name=%s exists"
 msgstr "Alarm with name=%s exists"
 
-#: ceilometer/api/controllers/v2.py:2015
+#: ceilometer/api/controllers/v2.py:2048
 #, python-format
 msgid "Cannot specify alarm %s itself in combination rule"
 msgstr "Cannot specify alarm %s itself in combination rule"
 
-#: ceilometer/api/controllers/v2.py:2023
+#: ceilometer/api/controllers/v2.py:2056
 #, python-format
 msgid "Error while putting alarm: %s"
 msgstr "Error while putting alarm: %s"
 
-#: ceilometer/api/controllers/v2.py:2024 ceilometer/api/controllers/v2.py:2175
+#: ceilometer/api/controllers/v2.py:2057 ceilometer/api/controllers/v2.py:2208
 msgid "Alarm incorrect"
 msgstr "Alarm incorrect"
 
-#: ceilometer/api/controllers/v2.py:2075
+#: ceilometer/api/controllers/v2.py:2108
 msgid "state invalid"
 msgstr "state invalid"
 
-#: ceilometer/api/controllers/v2.py:2168
+#: ceilometer/api/controllers/v2.py:2201
 #, python-format
 msgid "Alarm with name='%s' exists"
 msgstr "Alarm with name='%s' exists"
 
-#: ceilometer/api/controllers/v2.py:2174
+#: ceilometer/api/controllers/v2.py:2207
 #, python-format
 msgid "Error while posting alarm: %s"
 msgstr "Error while posting alarm: %s"
 
-#: ceilometer/api/controllers/v2.py:2327
+#: ceilometer/api/controllers/v2.py:2364
 msgid "operator {} is incorrect"
 msgstr "operator {} is incorrect"
 
-#: ceilometer/api/controllers/v2.py:2349
+#: ceilometer/api/controllers/v2.py:2386
 #, python-format
 msgid "Getting traits for %s"
 msgstr "Getting traits for %s"
 
-#: ceilometer/api/controllers/v2.py:2414
+#: ceilometer/api/controllers/v2.py:2451
 msgid "Event"
 msgstr "Event"
 
-#: ceilometer/api/controllers/v2.py:2417
+#: ceilometer/api/controllers/v2.py:2454
 #, 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"
 
-#: ceilometer/central/plugin.py:49
+#: ceilometer/central/plugin.py:66
 #, python-format
 msgid "Skip due to keystone error %s"
 msgstr "Skip due to keystone error %s"
 
-#: ceilometer/central/plugin.py:55
-msgid "Skipping because service is notregistered in keystone"
-msgstr "Skipping because service is notregistered in keystone"
+#: ceilometer/central/plugin.py:73
+#, python-format
+msgid "Skipping because %s service is not registered in keystone"
+msgstr ""
 
 #: ceilometer/cmd/storage.py:39
 msgid "Clearing expired metering data"
@@ -719,10 +740,10 @@ msgstr "CPUTIME USAGE: %(instance)s %(time)d"
 
 #: ceilometer/compute/pollsters/cpu.py:52
 #: ceilometer/compute/pollsters/cpu.py:83
-#: ceilometer/compute/pollsters/disk.py:121
-#: ceilometer/compute/pollsters/disk.py:326
+#: ceilometer/compute/pollsters/disk.py:122
+#: ceilometer/compute/pollsters/disk.py:327
 #: ceilometer/compute/pollsters/memory.py:47
-#: ceilometer/compute/pollsters/net.py:106
+#: ceilometer/compute/pollsters/net.py:107
 #, python-format
 msgid "Exception while getting samples %s"
 msgstr "Exception while getting samples %s"
@@ -757,16 +778,16 @@ 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:124
-#: ceilometer/compute/pollsters/disk.py:329
-#: ceilometer/compute/pollsters/net.py:109
+#: ceilometer/compute/pollsters/disk.py:125
+#: ceilometer/compute/pollsters/disk.py:330
+#: ceilometer/compute/pollsters/net.py:110
 #, 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:129
-#: ceilometer/compute/pollsters/disk.py:335
-#: ceilometer/compute/pollsters/net.py:114
+#: ceilometer/compute/pollsters/disk.py:130
+#: ceilometer/compute/pollsters/disk.py:336
+#: ceilometer/compute/pollsters/net.py:115
 #, python-format
 msgid "Ignoring instance %(name)s: %(error)s"
 msgstr "Ignoring instance %(name)s: %(error)s"
@@ -791,12 +812,12 @@ msgstr "Obtaining Memory Usage is not implemented for %s"
 msgid "Could not get Memory Usage for %(id)s: %(e)s"
 msgstr "Could not get Memory Usage for %(id)s: %(e)s"
 
-#: ceilometer/compute/pollsters/net.py:92
+#: ceilometer/compute/pollsters/net.py:93
 #, python-format
 msgid "checking net info for instance %s"
 msgstr "checking net info for instance %s"
 
-#: ceilometer/compute/virt/inspector.py:230
+#: ceilometer/compute/virt/inspector.py:231
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr "Unable to load the hypervisor inspector: %s"
@@ -898,7 +919,7 @@ msgstr "Failed to record metering data: %s"
 msgid "message signature invalid, discarding message: %r"
 msgstr "message signature invalid, discarding message: %r"
 
-#: ceilometer/energy/kwapi.py:78
+#: ceilometer/energy/kwapi.py:89
 msgid "Kwapi endpoint not found"
 msgstr "Kwapi endpoint not found"
 
@@ -969,35 +990,63 @@ msgstr "No Event Definitions configuration file found! Using default config."
 msgid "Event Definitions: %s"
 msgstr "Event Definitions: %s"
 
-#: ceilometer/event/endpoint.py:37
+#: ceilometer/event/endpoint.py:38
 msgid "Loading event definitions"
 msgstr "Loading event definitions"
 
-#: ceilometer/event/endpoint.py:63
+#: ceilometer/event/endpoint.py:64
 #, python-format
 msgid "Saving event \"%s\""
 msgstr "Saving event \"%s\""
 
-#: ceilometer/event/endpoint.py:70
+#: ceilometer/event/endpoint.py:71
 msgid "Event is not implemented with the storage backend"
 msgstr "Event is not implemented with the storage backend"
 
-#: ceilometer/hardware/discovery.py:59
+#: ceilometer/hardware/discovery.py:73
 #, python-format
 msgid "Couldn't obtain IP address ofinstance %s"
 msgstr "Couldn't obtain IP address ofinstance %s"
 
-#: ceilometer/hardware/plugin.py:73
+#: ceilometer/hardware/plugin.py:66
+msgid "Passed resource dict must contain keys resource_id and resource_url."
+msgstr ""
+
+#: ceilometer/hardware/plugin.py:108
 #, python-format
 msgid "inspector call failed for %(ident)s host %(host)s: %(err)s"
 msgstr "inspector call failed for %(ident)s host %(host)s: %(err)s"
 
-#: ceilometer/hardware/plugin.py:104
+#: ceilometer/hardware/plugin.py:139
 #, python-format
 msgid "Can NOT load inspector %(name)s: %(err)s"
 msgstr "Can NOT load inspector %(name)s: %(err)s"
 
-#: ceilometer/network/floatingip.py:45
+#: ceilometer/ipmi/platform/intel_node_manager.py:229
+msgid "Node Manager init failed"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmi_sensor.py:103
+msgid "Wrong sensor type"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:42
+msgid "parse IPMI sensor data failed,unknown sensor type"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:83
+msgid "parse IPMI sensor data failed,No data retrieved from given input"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:105
+msgid "ipmitool output length mismatch"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:128
+msgid "running ipmitool failure"
+msgstr ""
+
+#: ceilometer/network/floatingip.py:57
 #, python-format
 msgid "FLOATING IP USAGE: %s"
 msgstr "FLOATING IP USAGE: %s"
@@ -1007,32 +1056,32 @@ msgstr "FLOATING IP USAGE: %s"
 msgid "network notification %r"
 msgstr "network notification %r"
 
-#: ceilometer/network/services/fwaas.py:45
+#: ceilometer/network/services/fwaas.py:49
 #, python-format
 msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 
-#: ceilometer/network/services/lbaas.py:61
+#: ceilometer/network/services/lbaas.py:64
 #, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 
-#: ceilometer/network/services/lbaas.py:105
+#: ceilometer/network/services/lbaas.py:112
 #, python-format
 msgid "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 msgstr "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 
-#: ceilometer/network/services/lbaas.py:142
+#: ceilometer/network/services/lbaas.py:153
 #, python-format
 msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
 msgstr "Unknown status %(stat)s received on member %(id)s,skipping sample"
 
-#: ceilometer/network/services/lbaas.py:240
+#: ceilometer/network/services/lbaas.py:258
 #, python-format
 msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr "Ignoring pool %(pool_id)s: %(error)s"
 
-#: ceilometer/network/services/vpnaas.py:46
+#: ceilometer/network/services/vpnaas.py:50
 #, python-format
 msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
 msgstr "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
@@ -1053,7 +1102,7 @@ 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/swift.py:69
+#: ceilometer/objectstore/swift.py:77
 msgid "Swift endpoint not found"
 msgstr "Swift endpoint not found"
 
@@ -1112,17 +1161,58 @@ msgstr "Policy doesn't allow %s to be performed."
 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/strutils.py:114
+#: ceilometer/openstack/common/processutils.py:59
+msgid "Unexpected error while running command."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:62
+#, python-format
+msgid ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:143
+#, python-format
+msgid "Got unknown keyword args: %r"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:148
+msgid "Command requested root, but did not specify a root helper."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:158
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr "Running cmd (subprocess): %s"
+
+#: ceilometer/openstack/common/processutils.py:206
+#, python-format
+msgid "%r failed. Retrying."
+msgstr "%r failed. Retrying."
+
+#: ceilometer/openstack/common/processutils.py:247
+msgid "Environment not supported over SSH"
+msgstr "Environment not supported over SSH"
+
+#: ceilometer/openstack/common/processutils.py:251
+msgid "process_input not supported over SSH"
+msgstr "process_input not supported over SSH"
+
+#: ceilometer/openstack/common/strutils.py:125
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr "Unrecognised value '%(val)s', acceptable values are: %(acceptable)s"
 
-#: ceilometer/openstack/common/strutils.py:219
+#: ceilometer/openstack/common/strutils.py:230
 #, python-format
 msgid "Invalid unit system: \"%s\""
 msgstr "Invalid unit system: \"%s\""
 
-#: ceilometer/openstack/common/strutils.py:228
+#: ceilometer/openstack/common/strutils.py:239
 #, python-format
 msgid "Invalid string format: %s"
 msgstr "Invalid string format: %s"
@@ -1179,23 +1269,23 @@ msgstr "Unable to send sample over UDP"
 msgid "looking for %(name)r driver in %(namespace)r"
 msgstr "looking for %(name)r driver in %(namespace)r"
 
-#: ceilometer/storage/impl_hbase.py:291 ceilometer/storage/impl_hbase.py:340
+#: ceilometer/storage/impl_hbase.py:292 ceilometer/storage/impl_hbase.py:342
 #, python-format
 msgid "Query Resource table: %s"
 msgstr "Query Resource table: %s"
 
-#: ceilometer/storage/impl_hbase.py:333
+#: ceilometer/storage/impl_hbase.py:335
 msgid "Pagination not implemented"
 msgstr "Pagination not implemented"
 
-#: ceilometer/storage/impl_hbase.py:381
+#: ceilometer/storage/impl_hbase.py:383
 #, python-format
 msgid "Query Meter Table: %s"
 msgstr "Query Meter Table: %s"
 
-#: ceilometer/storage/impl_hbase.py:528
-#: ceilometer/storage/impl_sqlalchemy.py:722
-#: ceilometer/storage/pymongo_base.py:143
+#: ceilometer/storage/impl_hbase.py:531
+#: ceilometer/storage/impl_sqlalchemy.py:812
+#: ceilometer/storage/pymongo_base.py:144
 #, python-format
 msgid "Failed to record event: %s"
 msgstr "Failed to record event: %s"
@@ -1210,36 +1300,41 @@ msgstr "metering data %(counter_name)s for %(resource_id)s: %(counter_volume)s"
 msgid "Dropping data with TTL %d"
 msgstr "Dropping data with TTL %d"
 
-#: ceilometer/storage/impl_sqlalchemy.py:283
+#: ceilometer/storage/impl_sqlalchemy.py:308
 #, 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:315
+#: ceilometer/storage/impl_sqlalchemy.py:376
 #, python-format
 msgid "%d samples removed from database"
 msgstr "%d samples removed from database"
 
-#: ceilometer/storage/impl_sqlalchemy.py:718
-#: ceilometer/storage/pymongo_base.py:139
+#: ceilometer/storage/impl_sqlalchemy.py:808
+#: ceilometer/storage/pymongo_base.py:140
 #, python-format
 msgid "Failed to record duplicated event: %s"
 msgstr "Failed to record duplicated event: %s"
 
-#: ceilometer/storage/impl_sqlalchemy.py:737
+#: ceilometer/storage/impl_sqlalchemy.py:827
 #, python-format
 msgid "Getting events that match filter: %s"
 msgstr "Getting events that match filter: %s"
 
-#: ceilometer/storage/impl_sqlalchemy.py:848
+#: ceilometer/storage/impl_sqlalchemy.py:938
 #, python-format
 msgid "Get traits for %s"
 msgstr "Get traits for %s"
 
-#: ceilometer/storage/hbase/inmemory.py:257
+#: ceilometer/storage/hbase/inmemory.py:261
 msgid "Opening in-memory HBase connection"
 msgstr "Opening in-memory HBase connection"
 
+#: ceilometer/storage/hbase/utils.py:439
+#, python-format
+msgid "Cannot create table %(table_name)s   it already exists. Ignoring error"
+msgstr ""
+
 #: ceilometer/storage/mongo/utils.py:175
 #, python-format
 msgid "Connecting to %(db)s on %(nodelist)s"
diff --git a/ceilometer/locale/en_US/LC_MESSAGES/ceilometer.po b/ceilometer/locale/en_US/LC_MESSAGES/ceilometer.po
index 524fe4c9..e5681c05 100644
--- a/ceilometer/locale/en_US/LC_MESSAGES/ceilometer.po
+++ b/ceilometer/locale/en_US/LC_MESSAGES/ceilometer.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-02 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:05+0000\n"
 "PO-Revision-Date: 2012-12-11 06:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United States) "
@@ -18,22 +18,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: ceilometer/agent.py:85
+#: ceilometer/agent.py:92
 #, python-format
 msgid "Polling pollster %s"
 msgstr ""
 
-#: ceilometer/agent.py:95
+#: ceilometer/agent.py:108
 #, python-format
 msgid "Continue after error from %(name)s: %(error)s"
 msgstr ""
 
-#: ceilometer/agent.py:171
+#: ceilometer/agent.py:215
 #, python-format
 msgid "Unable to discover resources: %s"
 msgstr ""
 
-#: ceilometer/agent.py:173
+#: ceilometer/agent.py:217
 #, python-format
 msgid "Unknown discovery extension: %s"
 msgstr ""
@@ -135,53 +135,53 @@ msgstr ""
 msgid "%(worker_name)s value of %(workers)s is invalid, must be greater than 0"
 msgstr ""
 
-#: ceilometer/alarm/rpc.py:53
+#: ceilometer/alarm/rpc.py:56
 #, python-format
 msgid ""
 "alarm %(alarm_id)s has no action configured for state transition from "
 "%(previous)s to state %(state)s, skipping the notification."
 msgstr ""
 
-#: ceilometer/alarm/service.py:90
+#: ceilometer/alarm/service.py:93
 #, python-format
 msgid "initiating evaluation cycle on %d alarms"
 msgstr ""
 
-#: ceilometer/alarm/service.py:95
+#: ceilometer/alarm/service.py:98
 msgid "alarm evaluation cycle failed"
 msgstr ""
 
-#: ceilometer/alarm/service.py:100
+#: ceilometer/alarm/service.py:103
 #, python-format
 msgid "skipping alarm %s: type unsupported"
 msgstr ""
 
-#: ceilometer/alarm/service.py:104
+#: ceilometer/alarm/service.py:107
 #, python-format
 msgid "evaluating alarm %s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:216
+#: ceilometer/alarm/service.py:261
 #, python-format
 msgid "Unable to parse action %(action)s for alarm %(alarm_id)s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:225
+#: ceilometer/alarm/service.py:270
 #, python-format
 msgid "Action %(scheme)s for alarm %(alarm_id)s is unknown, cannot notify"
 msgstr ""
 
-#: ceilometer/alarm/service.py:231
+#: ceilometer/alarm/service.py:276
 #, python-format
 msgid "Notifying alarm %(id)s with action %(act)s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:236
+#: ceilometer/alarm/service.py:281
 #, python-format
 msgid "Unable to notify alarm %s"
 msgstr ""
 
-#: ceilometer/alarm/service.py:255
+#: ceilometer/alarm/service.py:300
 msgid "Unable to notify for an alarm with no action"
 msgstr ""
 
@@ -409,47 +409,47 @@ msgstr ""
 msgid "assignment retrieval failed"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:91
-#: ceilometer/storage/impl_hbase.py:154
+#: ceilometer/alarm/storage/impl_hbase.py:92
+#: ceilometer/storage/impl_hbase.py:155
 msgid "Creating a new in-memory HBase Connection object"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:105
-#: ceilometer/storage/impl_hbase.py:169
+#: ceilometer/alarm/storage/impl_hbase.py:107
+#: ceilometer/storage/impl_hbase.py:170
 msgid "Dropping HBase schema..."
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:112
-#: ceilometer/storage/impl_hbase.py:177
+#: ceilometer/alarm/storage/impl_hbase.py:114
+#: ceilometer/storage/impl_hbase.py:178
 msgid "Cannot disable table but ignoring error"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:116
-#: ceilometer/storage/impl_hbase.py:181
+#: ceilometer/alarm/storage/impl_hbase.py:118
+#: ceilometer/storage/impl_hbase.py:182
 msgid "Cannot delete table but ignoring error"
 msgstr ""
 
-#: ceilometer/alarm/storage/impl_hbase.py:127
-#: ceilometer/storage/impl_hbase.py:192
+#: ceilometer/alarm/storage/impl_hbase.py:129
+#: ceilometer/storage/impl_hbase.py:193
 #, python-format
 msgid "connecting to HBase on %(host)s:%(port)s"
 msgstr ""
 
-#: ceilometer/api/app.py:154
+#: ceilometer/api/app.py:163
 #, python-format
 msgid "Starting server in PID %s"
 msgstr ""
 
-#: ceilometer/api/app.py:155
+#: ceilometer/api/app.py:164
 msgid "Configuration:"
 msgstr ""
 
-#: ceilometer/api/app.py:159
+#: ceilometer/api/app.py:168
 #, 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:163
+#: ceilometer/api/app.py:172
 #, python-format
 msgid "serving on http://%(host)s:%(port)s"
 msgstr ""
@@ -459,185 +459,206 @@ msgstr ""
 msgid "Error parsing HTTP response: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:94
+#: ceilometer/api/controllers/v2.py:97
 #, python-format
 msgid "%(entity)s %(id)s Not Found"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:102
+#: ceilometer/api/controllers/v2.py:105
 #, python-format
 msgid "Alarm %s not found"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:104
+#: ceilometer/api/controllers/v2.py:107
 #, python-format
 msgid "Alarm %(alarm_id)s not found in project %(project)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:117
+#: ceilometer/api/controllers/v2.py:120
 #, python-format
 msgid "Alarm quota exceeded for user %(u)s on project %(p)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:310
+#: ceilometer/api/controllers/v2.py:313
 #, python-format
 msgid "Unable to convert the value %(value)s to the expected data type %(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:315
+#: ceilometer/api/controllers/v2.py:318
 #, python-format
 msgid ""
 "The data type %(type)s is not supported. The supported data type list is:"
 " %(supported)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:320
+#: ceilometer/api/controllers/v2.py:323
 #, python-format
 msgid ""
 "Unexpected exception converting %(value)s to the expected data type "
 "%(type)s."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:331
+#: ceilometer/api/controllers/v2.py:334
 #, python-format
 msgid "Not Authorized to access %(aspect)s %(id)s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:804
+#: ceilometer/api/controllers/v2.py:809
 msgid "clamping min timestamp to range"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:809
+#: ceilometer/api/controllers/v2.py:814
 msgid "clamping max timestamp to range"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:885 ceilometer/api/controllers/v2.py:1151
+#: ceilometer/api/controllers/v2.py:890 ceilometer/api/controllers/v2.py:1156
 msgid "Limit must be positive"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:968
+#: ceilometer/api/controllers/v2.py:973
 msgid "Period must be positive."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:980
+#: ceilometer/api/controllers/v2.py:985
 #, python-format
 msgid "computed value coming from %r"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1167
+#: ceilometer/api/controllers/v2.py:1172
 msgid "Sample"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1350
+#: ceilometer/api/controllers/v2.py:1337
+#, python-format
+msgid "Filter expression not valid: %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1352
+#, python-format
+msgid "Order-by expression not valid: %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1363
 msgid "Limit should be positive"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1443
+#: ceilometer/api/controllers/v2.py:1456
 #, python-format
 msgid "String %s is not a valid isotime"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1444
+#: ceilometer/api/controllers/v2.py:1457
 #, python-format
 msgid "Failed to parse the timestamp value %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1530
+#: ceilometer/api/controllers/v2.py:1543
 msgid "Resource"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1605
+#: ceilometer/api/controllers/v2.py:1618
 #, 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.py:1645
+#: ceilometer/api/controllers/v2.py:1658
 #, python-format
 msgid "Combined state of alarms %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1654
+#: ceilometer/api/controllers/v2.py:1667
 msgid "Alarm combination rule should contain at least two different alarm ids."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1705
+#: ceilometer/api/controllers/v2.py:1718
 #, python-format
 msgid "Timezone %s is not valid"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1830
+#: ceilometer/api/controllers/v2.py:1844
 msgid "Time constraint names must be unique for a given alarm."
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1840
+#: ceilometer/api/controllers/v2.py:1854
 #, python-format
 msgid "%(rule)s must be set for %(type)s type alarm"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:1844
+#: ceilometer/api/controllers/v2.py:1858
 msgid "threshold_rule and combination_rule cannot be set at the same time"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2008
+#: ceilometer/api/controllers/v2.py:1875
+#, python-format
+msgid "Unable to parse action %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:1878
+#, python-format
+msgid "Unsupported action %s"
+msgstr ""
+
+#: ceilometer/api/controllers/v2.py:2041
 #, python-format
 msgid "Alarm with name=%s exists"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2015
+#: ceilometer/api/controllers/v2.py:2048
 #, python-format
 msgid "Cannot specify alarm %s itself in combination rule"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2023
+#: ceilometer/api/controllers/v2.py:2056
 #, python-format
 msgid "Error while putting alarm: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2024 ceilometer/api/controllers/v2.py:2175
+#: ceilometer/api/controllers/v2.py:2057 ceilometer/api/controllers/v2.py:2208
 msgid "Alarm incorrect"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2075
+#: ceilometer/api/controllers/v2.py:2108
 msgid "state invalid"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2168
+#: ceilometer/api/controllers/v2.py:2201
 #, python-format
 msgid "Alarm with name='%s' exists"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2174
+#: ceilometer/api/controllers/v2.py:2207
 #, python-format
 msgid "Error while posting alarm: %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2327
+#: ceilometer/api/controllers/v2.py:2364
 msgid "operator {} is incorrect"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2349
+#: ceilometer/api/controllers/v2.py:2386
 #, python-format
 msgid "Getting traits for %s"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2414
+#: ceilometer/api/controllers/v2.py:2451
 msgid "Event"
 msgstr ""
 
-#: ceilometer/api/controllers/v2.py:2417
+#: ceilometer/api/controllers/v2.py:2454
 #, python-format
 msgid "More than one event with id %s returned from storage driver"
 msgstr ""
 
-#: ceilometer/central/plugin.py:49
+#: ceilometer/central/plugin.py:66
 #, python-format
 msgid "Skip due to keystone error %s"
 msgstr ""
 
-#: ceilometer/central/plugin.py:55
-msgid "Skipping because service is notregistered in keystone"
+#: ceilometer/central/plugin.py:73
+#, python-format
+msgid "Skipping because %s service is not registered in keystone"
 msgstr ""
 
 #: ceilometer/cmd/storage.py:39
@@ -694,10 +715,10 @@ msgstr ""
 
 #: ceilometer/compute/pollsters/cpu.py:52
 #: ceilometer/compute/pollsters/cpu.py:83
-#: ceilometer/compute/pollsters/disk.py:121
-#: ceilometer/compute/pollsters/disk.py:326
+#: ceilometer/compute/pollsters/disk.py:122
+#: ceilometer/compute/pollsters/disk.py:327
 #: ceilometer/compute/pollsters/memory.py:47
-#: ceilometer/compute/pollsters/net.py:106
+#: ceilometer/compute/pollsters/net.py:107
 #, python-format
 msgid "Exception while getting samples %s"
 msgstr ""
@@ -732,16 +753,16 @@ msgstr ""
 msgid "Could not get CPU Util for %(id)s: %(e)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:124
-#: ceilometer/compute/pollsters/disk.py:329
-#: ceilometer/compute/pollsters/net.py:109
+#: ceilometer/compute/pollsters/disk.py:125
+#: ceilometer/compute/pollsters/disk.py:330
+#: ceilometer/compute/pollsters/net.py:110
 #, python-format
 msgid "%(inspector)s does not provide data for  %(pollster)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/disk.py:129
-#: ceilometer/compute/pollsters/disk.py:335
-#: ceilometer/compute/pollsters/net.py:114
+#: ceilometer/compute/pollsters/disk.py:130
+#: ceilometer/compute/pollsters/disk.py:336
+#: ceilometer/compute/pollsters/net.py:115
 #, python-format
 msgid "Ignoring instance %(name)s: %(error)s"
 msgstr ""
@@ -766,12 +787,12 @@ msgstr ""
 msgid "Could not get Memory Usage for %(id)s: %(e)s"
 msgstr ""
 
-#: ceilometer/compute/pollsters/net.py:92
+#: ceilometer/compute/pollsters/net.py:93
 #, python-format
 msgid "checking net info for instance %s"
 msgstr ""
 
-#: ceilometer/compute/virt/inspector.py:230
+#: ceilometer/compute/virt/inspector.py:231
 #, python-format
 msgid "Unable to load the hypervisor inspector: %s"
 msgstr ""
@@ -867,7 +888,7 @@ msgstr ""
 msgid "message signature invalid, discarding message: %r"
 msgstr ""
 
-#: ceilometer/energy/kwapi.py:78
+#: ceilometer/energy/kwapi.py:89
 msgid "Kwapi endpoint not found"
 msgstr ""
 
@@ -934,35 +955,63 @@ msgstr ""
 msgid "Event Definitions: %s"
 msgstr ""
 
-#: ceilometer/event/endpoint.py:37
+#: ceilometer/event/endpoint.py:38
 msgid "Loading event definitions"
 msgstr ""
 
-#: ceilometer/event/endpoint.py:63
+#: ceilometer/event/endpoint.py:64
 #, python-format
 msgid "Saving event \"%s\""
 msgstr ""
 
-#: ceilometer/event/endpoint.py:70
+#: ceilometer/event/endpoint.py:71
 msgid "Event is not implemented with the storage backend"
 msgstr ""
 
-#: ceilometer/hardware/discovery.py:59
+#: ceilometer/hardware/discovery.py:73
 #, python-format
 msgid "Couldn't obtain IP address ofinstance %s"
 msgstr ""
 
-#: ceilometer/hardware/plugin.py:73
+#: ceilometer/hardware/plugin.py:66
+msgid "Passed resource dict must contain keys resource_id and resource_url."
+msgstr ""
+
+#: ceilometer/hardware/plugin.py:108
 #, python-format
 msgid "inspector call failed for %(ident)s host %(host)s: %(err)s"
 msgstr ""
 
-#: ceilometer/hardware/plugin.py:104
+#: ceilometer/hardware/plugin.py:139
 #, python-format
 msgid "Can NOT load inspector %(name)s: %(err)s"
 msgstr ""
 
-#: ceilometer/network/floatingip.py:45
+#: ceilometer/ipmi/platform/intel_node_manager.py:229
+msgid "Node Manager init failed"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmi_sensor.py:103
+msgid "Wrong sensor type"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:42
+msgid "parse IPMI sensor data failed,unknown sensor type"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:83
+msgid "parse IPMI sensor data failed,No data retrieved from given input"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:105
+msgid "ipmitool output length mismatch"
+msgstr ""
+
+#: ceilometer/ipmi/platform/ipmitool.py:128
+msgid "running ipmitool failure"
+msgstr ""
+
+#: ceilometer/network/floatingip.py:57
 #, python-format
 msgid "FLOATING IP USAGE: %s"
 msgstr ""
@@ -972,32 +1021,32 @@ msgstr ""
 msgid "network notification %r"
 msgstr ""
 
-#: ceilometer/network/services/fwaas.py:45
+#: ceilometer/network/services/fwaas.py:49
 #, python-format
 msgid "Unknown status %(stat)s received on fw %(id)s,skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:61
+#: ceilometer/network/services/lbaas.py:64
 #, python-format
 msgid "Unknown status %(stat)s received on pool %(id)s, skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:105
+#: ceilometer/network/services/lbaas.py:112
 #, python-format
 msgid "Unknown status %(stat)s received on vip %(id)s, skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:142
+#: ceilometer/network/services/lbaas.py:153
 #, python-format
 msgid "Unknown status %(stat)s received on member %(id)s,skipping sample"
 msgstr ""
 
-#: ceilometer/network/services/lbaas.py:240
+#: ceilometer/network/services/lbaas.py:258
 #, python-format
 msgid "Ignoring pool %(pool_id)s: %(error)s"
 msgstr ""
 
-#: ceilometer/network/services/vpnaas.py:46
+#: ceilometer/network/services/vpnaas.py:50
 #, python-format
 msgid "Unknown status %(stat)s received on vpn %(id)s,skipping sample"
 msgstr ""
@@ -1018,7 +1067,7 @@ msgstr ""
 msgid "Request failed to connect to OpenDaylight with NorthBound REST API"
 msgstr ""
 
-#: ceilometer/objectstore/swift.py:69
+#: ceilometer/objectstore/swift.py:77
 msgid "Swift endpoint not found"
 msgstr ""
 
@@ -1075,17 +1124,58 @@ msgstr ""
 msgid "Rules must be an instance of dict or Rules, got %s instead"
 msgstr ""
 
-#: ceilometer/openstack/common/strutils.py:114
+#: ceilometer/openstack/common/processutils.py:59
+msgid "Unexpected error while running command."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:62
+#, python-format
+msgid ""
+"%(description)s\n"
+"Command: %(cmd)s\n"
+"Exit code: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:143
+#, python-format
+msgid "Got unknown keyword args: %r"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:148
+msgid "Command requested root, but did not specify a root helper."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:158
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:206
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:247
+msgid "Environment not supported over SSH"
+msgstr ""
+
+#: ceilometer/openstack/common/processutils.py:251
+msgid "process_input not supported over SSH"
+msgstr ""
+
+#: ceilometer/openstack/common/strutils.py:125
 #, python-format
 msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s"
 msgstr ""
 
-#: ceilometer/openstack/common/strutils.py:219
+#: ceilometer/openstack/common/strutils.py:230
 #, python-format
 msgid "Invalid unit system: \"%s\""
 msgstr ""
 
-#: ceilometer/openstack/common/strutils.py:228
+#: ceilometer/openstack/common/strutils.py:239
 #, python-format
 msgid "Invalid string format: %s"
 msgstr ""
@@ -1142,23 +1232,23 @@ msgstr ""
 msgid "looking for %(name)r driver in %(namespace)r"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:291 ceilometer/storage/impl_hbase.py:340
+#: ceilometer/storage/impl_hbase.py:292 ceilometer/storage/impl_hbase.py:342
 #, python-format
 msgid "Query Resource table: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:333
+#: ceilometer/storage/impl_hbase.py:335
 msgid "Pagination not implemented"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:381
+#: ceilometer/storage/impl_hbase.py:383
 #, python-format
 msgid "Query Meter Table: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_hbase.py:528
-#: ceilometer/storage/impl_sqlalchemy.py:722
-#: ceilometer/storage/pymongo_base.py:143
+#: ceilometer/storage/impl_hbase.py:531
+#: ceilometer/storage/impl_sqlalchemy.py:812
+#: ceilometer/storage/pymongo_base.py:144
 #, python-format
 msgid "Failed to record event: %s"
 msgstr ""
@@ -1173,36 +1263,41 @@ msgstr ""
 msgid "Dropping data with TTL %d"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:283
+#: ceilometer/storage/impl_sqlalchemy.py:308
 #, python-format
 msgid "Unknown metadata type. Key (%s) will not be queryable."
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:315
+#: ceilometer/storage/impl_sqlalchemy.py:376
 #, python-format
 msgid "%d samples removed from database"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:718
-#: ceilometer/storage/pymongo_base.py:139
+#: ceilometer/storage/impl_sqlalchemy.py:808
+#: ceilometer/storage/pymongo_base.py:140
 #, python-format
 msgid "Failed to record duplicated event: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:737
+#: ceilometer/storage/impl_sqlalchemy.py:827
 #, python-format
 msgid "Getting events that match filter: %s"
 msgstr ""
 
-#: ceilometer/storage/impl_sqlalchemy.py:848
+#: ceilometer/storage/impl_sqlalchemy.py:938
 #, python-format
 msgid "Get traits for %s"
 msgstr ""
 
-#: ceilometer/storage/hbase/inmemory.py:257
+#: ceilometer/storage/hbase/inmemory.py:261
 msgid "Opening in-memory HBase connection"
 msgstr ""
 
+#: ceilometer/storage/hbase/utils.py:439
+#, python-format
+msgid "Cannot create table %(table_name)s   it already exists. Ignoring error"
+msgstr ""
+
 #: ceilometer/storage/mongo/utils.py:175
 #, python-format
 msgid "Connecting to %(db)s on %(nodelist)s"
diff --git a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po b/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po
index d2ac0ad2..093a9767 100644
--- a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po
+++ b/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-info.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the ceilometer project.
 #
 # Translators:
+# Bruno Cornec <bruno.cornec@hp.com>, 2014
 # Frédéric <frosmont@free.fr>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-09 06:08+0000\n"
-"PO-Revision-Date: 2014-09-02 12:34+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"POT-Creation-Date: 2014-09-24 06:05+0000\n"
+"PO-Revision-Date: 2014-09-17 18:00+0000\n"
+"Last-Translator: Bruno Cornec <bruno.cornec@hp.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
 "language/fr/)\n"
 "Language: fr\n"
@@ -27,7 +28,7 @@ msgstr ""
 #: ceilometer/coordination.py:99
 #, python-format
 msgid "Joined partitioning group %s"
-msgstr ""
+msgstr "Le groupe de partitionnement %s a été rejoint"
 
 #: ceilometer/openstack/common/eventlet_backdoor.py:140
 #, python-format
@@ -56,7 +57,7 @@ msgstr "Processus parent arrêté de manière inattendue, sortie"
 #: ceilometer/openstack/common/service.py:271
 #, python-format
 msgid "Child caught %s, exiting"
-msgstr ""
+msgstr "L'enfant a reçu %s, sortie"
 
 #: ceilometer/openstack/common/service.py:310
 msgid "Forking too fast, sleeping"
diff --git a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po b/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po
index 7a22dca4..3f4b1063 100644
--- a/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po
+++ b/ceilometer/locale/fr/LC_MESSAGES/ceilometer-log-warning.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ceilometer\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-02 06:09+0000\n"
+"POT-Creation-Date: 2014-09-24 06:05+0000\n"
 "PO-Revision-Date: 2014-07-17 07:01+0000\n"
 "Last-Translator: Frédéric <frosmont@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/ceilometer/"
@@ -20,6 +20,11 @@ msgstr ""
 "Generated-By: Babel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ceilometer/central/discovery.py:46
+#, python-format
+msgid "No endpoints found for service %s"
+msgstr ""
+
 #: ceilometer/openstack/common/loopingcall.py:87
 #, python-format
 msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"