Merge "Imported Translations from Transifex"

3 files changed, 159 insertions, 125 deletions

diff --git a/ironic/locale/fr/LC_MESSAGES/ironic-log-critical.po b/ironic/locale/fr/LC_MESSAGES/ironic-log-critical.po
new file mode 100644
index 000000000..382735eb9
--- /dev/null
+++ b/ironic/locale/fr/LC_MESSAGES/ironic-log-critical.po
@@ -0,0 +1,26 @@
+# Translations template for ironic.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the ironic project.
+#
+# Translators:
+# Maxime COQUEREL <max.coquerel@gmail.com>, 2014
+# Andrew_Melim <nokostya.translation@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Ironic\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-09-30 06:47+0000\n"
+"PO-Revision-Date: 2014-09-25 15:41+0000\n"
+"Last-Translator: Maxime COQUEREL <max.coquerel@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/ironic/language/"
+"fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ironic/conductor/manager.py:216
+msgid "Failed to start keepalive"
+msgstr "Echec de démarrage keepalive"
diff --git a/ironic/locale/ironic-log-warning.pot b/ironic/locale/ironic-log-warning.pot
index 1c9a81ee8..58b0b0b21 100644
--- a/ironic/locale/ironic-log-warning.pot
+++ b/ironic/locale/ironic-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ironic 2014.2.dev98.g8576905\n"
+"Project-Id-Version: ironic 2014.2.dev151.g8a0923c\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-22 06:09+0000\n"
+"POT-Creation-Date: 2014-09-30 06:47+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,34 +17,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: ironic/common/disk_partitioner.py:134
+#: ironic/common/disk_partitioner.py:133
 #, python-format
 msgid "Failed to check the device %(device)s with fuser: %(err)s"
 msgstr ""
 
-#: ironic/common/disk_partitioner.py:201
+#: ironic/common/disk_partitioner.py:199
 #, python-format
 msgid ""
 "Partition information from parted for device %(device)s does not match "
 "expected format: %(line)s"
 msgstr ""
 
-#: ironic/common/utils.py:464
+#: ironic/common/utils.py:477
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:473
+#: ironic/common/utils.py:486
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:489
+#: ironic/common/utils.py:502
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:503
+#: ironic/common/utils.py:516
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -58,7 +58,14 @@ msgid ""
 "Updating registration"
 msgstr ""
 
-#: ironic/conductor/manager.py:404
+#: ironic/conductor/manager.py:293
+#, python-format
+msgid ""
+"No free conductor workers available to perform an action on node "
+"%(node)s, setting node's power state back to %(power_state)s."
+msgstr ""
+
+#: ironic/conductor/manager.py:435
 #, python-format
 msgid ""
 "No free conductor workers available to perform an action on node "
@@ -66,78 +73,78 @@ msgid ""
 "target_provision_state to %(tgt_prov_state)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:500
+#: ironic/conductor/manager.py:530
 #, python-format
 msgid "Error in deploy of node %(node)s: %(err)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:588
+#: ironic/conductor/manager.py:617
 #, python-format
 msgid "Error in tear_down of node %(node)s: %(err)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:652
+#: ironic/conductor/manager.py:681
 #, python-format
 msgid ""
 "During sync_power_state, could not get power state for node %(node)s. "
 "Error: %(err)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:677
+#: ironic/conductor/manager.py:706
 #, python-format
 msgid ""
 "During sync_power_state, node %(node)s state does not match expected "
 "state '%(state)s'. Updating recorded state to '%(actual)s'."
 msgstr ""
 
-#: ironic/conductor/manager.py:693
+#: ironic/conductor/manager.py:722
 #, python-format
 msgid ""
 "During sync_power_state, node %(node)s state '%(actual)s' does not match "
 "expected state. Changing hardware state to '%(state)s'."
 msgstr ""
 
-#: ironic/conductor/manager.py:710
+#: ironic/conductor/manager.py:739
 #, python-format
 msgid "%(left)s attempts remaining to sync_power_state for node %(node)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1079
+#: ironic/conductor/manager.py:1107
 #, python-format
 msgid ""
 "No VIF found for instance %(instance)s port %(port)s when attempting to "
 "update port MAC address."
 msgstr ""
 
-#: ironic/conductor/manager.py:1134
+#: ironic/conductor/manager.py:1162
 #, python-format
 msgid ""
 "get_sensors_data is not implemented for driver %(driver)s, node_uuid is "
 "%(node)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1138
+#: ironic/conductor/manager.py:1166
 #, python-format
 msgid ""
 "During get_sensors_data, could not parse sensor data for node %(node)s. "
 "Error: %(err)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:1142
+#: ironic/conductor/manager.py:1170
 #, python-format
 msgid ""
 "During get_sensors_data, could not get sensor data for node %(node)s. "
 "Error: %(err)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:1146
+#: ironic/conductor/manager.py:1174
 #, python-format
 msgid ""
 "During send_sensor_data, node %(node)s was not found and presumed deleted"
 " by another process."
 msgstr ""
 
-#: ironic/conductor/manager.py:1150
+#: ironic/conductor/manager.py:1178
 #, python-format
 msgid "Failed to get sensor data for node %(node)s. Error: %(error)s"
 msgstr ""
@@ -147,38 +154,31 @@ msgstr ""
 msgid "Task's on_error hook failed to call %(method)s on node %(node)s"
 msgstr ""
 
-#: ironic/conductor/utils.py:90
+#: ironic/conductor/utils.py:89
 #, python-format
 msgid ""
 "Not going to change_node_power_state because current state = requested "
 "state = '%(state)s'."
 msgstr ""
 
-#: ironic/conductor/utils.py:97
+#: ironic/conductor/utils.py:96
 #, python-format
 msgid "Driver returns ERROR power state for node %s."
 msgstr ""
 
-#: ironic/dhcp/neutron.py:146
-#, python-format
-msgid ""
-"No VIFs found for node %(node)s when attempting to update DHCP BOOT "
-"options."
-msgstr ""
-
-#: ironic/dhcp/neutron.py:164
+#: ironic/dhcp/neutron.py:167
 #, python-format
 msgid ""
 "Some errors were encountered when updating the DHCP BOOT options for node"
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/dhcp/neutron.py:226
+#: ironic/dhcp/neutron.py:231
 #, python-format
 msgid "No VIFs found for node %(node)s when attempting  to get port IP address."
 msgstr ""
 
-#: ironic/dhcp/neutron.py:253
+#: ironic/dhcp/neutron.py:260
 #, python-format
 msgid ""
 "Some errors were encountered on node %(node)s while retrieving IP address"
@@ -190,12 +190,12 @@ msgstr ""
 msgid "Ignoring malformed capability '%s'. Format should be 'key:val'."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:563
+#: ironic/drivers/modules/agent.py:576
 #, python-format
 msgid "Malformed MAC: %s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:602
+#: ironic/drivers/modules/agent.py:615
 #, python-format
 msgid "MAC address %s not found in database"
 msgstr ""
@@ -291,13 +291,13 @@ msgid ""
 "%(cmd)s\". Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:338
+#: ironic/drivers/modules/pxe.py:337
 msgid ""
 "ipmitool is unable to set boot device while the node is in UEFI boot "
 "mode.Please set the boot device manually."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:402
+#: ironic/drivers/modules/pxe.py:401
 #, python-format
 msgid "Could not get image info to clean up images for node %(node)s: %(err)s"
 msgstr ""
@@ -317,19 +317,19 @@ msgstr ""
 msgid "Reboot failed for node %s."
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:348
+#: ironic/drivers/modules/snmp.py:361
 #, python-format
 msgid "SNMP PDU %(addr)s outlet %(outlet)s: unrecognised power state %(state)s."
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:468
+#: ironic/drivers/modules/snmp.py:481
 #, python-format
 msgid ""
 "Eaton Power SNMP PDU %(addr)s outlet %(outlet)s: unrecognised power state"
 " %(state)s."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:686
+#: ironic/drivers/modules/ssh.py:678
 #, python-format
 msgid ""
 "Failed to get boot device for node %(node)s, virt_type %(vtype)s does not"
diff --git a/ironic/locale/ironic.pot b/ironic/locale/ironic.pot
index 20c1f8d27..49f394774 100644
--- a/ironic/locale/ironic.pot
+++ b/ironic/locale/ironic.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ironic 2014.2.dev98.g8576905\n"
+"Project-Id-Version: ironic 2014.2.dev151.g8a0923c\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-22 06:09+0000\n"
+"POT-Creation-Date: 2014-09-30 06:47+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"
@@ -88,14 +88,14 @@ msgstr ""
 msgid "ErrorDocumentMiddleware received an invalid status %s"
 msgstr ""
 
-#: ironic/common/disk_partitioner.py:167
+#: ironic/common/disk_partitioner.py:166
 #, python-format
 msgid ""
 "Disk partitioning failed on device %(device)s. Processes with the "
 "following PIDs are holding it: %(pids)s. Time out waiting for completion."
 msgstr ""
 
-#: ironic/common/disk_partitioner.py:173
+#: ironic/common/disk_partitioner.py:172
 #, python-format
 msgid ""
 "Disk partitioning failed on device %(device)s. Fuser exited with "
@@ -584,11 +584,11 @@ msgstr ""
 msgid "post object"
 msgstr ""
 
-#: ironic/common/utils.py:102
+#: ironic/common/utils.py:117
 msgid "Invalid private key"
 msgstr ""
 
-#: ironic/common/utils.py:149
+#: ironic/common/utils.py:164
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
@@ -624,54 +624,54 @@ msgstr ""
 msgid "Invalid method call: update_node can not change node state."
 msgstr ""
 
-#: ironic/conductor/manager.py:402
+#: ironic/conductor/manager.py:291 ironic/conductor/manager.py:433
 msgid "No free conductor workers available"
 msgstr ""
 
-#: ironic/conductor/manager.py:450
+#: ironic/conductor/manager.py:481
 #, python-format
 msgid ""
 "RPC do_node_deploy called to rebuild %(node)s, but provision state is "
 "%(curstate)s. State must be one of : %(states)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:457
+#: ironic/conductor/manager.py:488
 #, python-format
 msgid ""
 "RPC do_node_deploy called for %(node)s, but provision state is already "
 "%(state)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:463
+#: ironic/conductor/manager.py:494
 msgid "provisioning"
 msgstr ""
 
-#: ironic/conductor/manager.py:470
+#: ironic/conductor/manager.py:501
 #, python-format
 msgid "RPC do_node_deploy failed to validate deploy info. Error: %(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:502
+#: ironic/conductor/manager.py:532
 #, python-format
 msgid "Failed to deploy. Error: %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:545
+#: ironic/conductor/manager.py:575
 #, python-format
 msgid "RPC do_node_tear_down not allowed for node %(node)s in state %(state)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:558
+#: ironic/conductor/manager.py:588
 #, python-format
 msgid "RPC do_node_tear_down failed to validate power info. Error: %(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:591
+#: ironic/conductor/manager.py:620
 #, python-format
 msgid "Failed to tear down. Error: %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:618
+#: ironic/conductor/manager.py:647
 #, python-format
 msgid ""
 "During sync_power_state, max retries exceeded for node %(node)s, node "
@@ -679,44 +679,44 @@ msgid ""
 "state to '%(actual)s' Switching node to maintenance mode."
 msgstr ""
 
-#: ironic/conductor/manager.py:647
+#: ironic/conductor/manager.py:676
 msgid "Driver returns ERROR state."
 msgstr ""
 
-#: ironic/conductor/manager.py:873
+#: ironic/conductor/manager.py:902
 msgid "not supported"
 msgstr ""
 
-#: ironic/conductor/manager.py:902
+#: ironic/conductor/manager.py:931
 msgid "The node is already in maintenance mode"
 msgstr ""
 
-#: ironic/conductor/manager.py:903
+#: ironic/conductor/manager.py:932
 msgid "The node is not in maintenance mode"
 msgstr ""
 
-#: ironic/conductor/manager.py:946
+#: ironic/conductor/manager.py:975
 #, python-format
 msgid "Node %s can't be deleted because it's not powered off"
 msgstr ""
 
-#: ironic/conductor/manager.py:1020
+#: ironic/conductor/manager.py:1047
 msgid "enabled"
 msgstr ""
 
-#: ironic/conductor/manager.py:1020
+#: ironic/conductor/manager.py:1047
 msgid "disabled"
 msgstr ""
 
-#: ironic/conductor/manager.py:1040
+#: ironic/conductor/manager.py:1067
 msgid "enabling"
 msgstr ""
 
-#: ironic/conductor/manager.py:1040
+#: ironic/conductor/manager.py:1067
 msgid "disabling"
 msgstr ""
 
-#: ironic/conductor/manager.py:1041
+#: ironic/conductor/manager.py:1068
 #, python-format
 msgid "Error %(op)s the console on node %(node)s. Reason: %(error)s"
 msgstr ""
@@ -726,22 +726,22 @@ msgstr ""
 msgid "No conductor service registered which supports driver %s."
 msgstr ""
 
-#: ironic/conductor/utils.py:73 ironic/conductor/utils.py:116
+#: ironic/conductor/utils.py:72 ironic/conductor/utils.py:116
 #, python-format
 msgid "Failed to change power state to '%(target)s'. Error: %(error)s"
 msgstr ""
 
-#: ironic/conductor/utils.py:140
+#: ironic/conductor/utils.py:139
 #, python-format
 msgid "Timeout reached while waiting for callback for node %s"
 msgstr ""
 
-#: ironic/conductor/utils.py:146
+#: ironic/conductor/utils.py:145
 #, python-format
 msgid "Cleanup failed for node %(node)s after deploy timeout:  %(error)s"
 msgstr ""
 
-#: ironic/conductor/utils.py:158
+#: ironic/conductor/utils.py:157
 msgid ""
 "Deploy timed out, but an unhandled exception was encountered while "
 "aborting. More info may be found in the log file."
@@ -759,11 +759,18 @@ msgstr ""
 msgid "Cannot overwrite UUID for an existing Chassis."
 msgstr ""
 
-#: ironic/dhcp/neutron.py:70
+#: ironic/dhcp/neutron.py:66
 msgid "Neutron auth_strategy should be either \"noauth\" or \"keystone\"."
 msgstr ""
 
-#: ironic/dhcp/neutron.py:160
+#: ironic/dhcp/neutron.py:149
+#, python-format
+msgid ""
+"No VIFs found for node %(node)s when attempting to update DHCP BOOT "
+"options."
+msgstr ""
+
+#: ironic/dhcp/neutron.py:163
 #, python-format
 msgid "Failed to set DHCP BOOT options for any port on node %s."
 msgstr ""
@@ -790,11 +797,11 @@ msgid "Unable to import iboot library"
 msgstr ""
 
 #: ironic/drivers/fake.py:141 ironic/drivers/ilo.py:43 ironic/drivers/ilo.py:66
-#: ironic/drivers/pxe.py:158
+#: ironic/drivers/pxe.py:160
 msgid "Unable to import proliantutils library"
 msgstr ""
 
-#: ironic/drivers/fake.py:167 ironic/drivers/pxe.py:180
+#: ironic/drivers/fake.py:167 ironic/drivers/pxe.py:182
 msgid "Unable to import pysnmp library"
 msgstr ""
 
@@ -811,12 +818,12 @@ msgstr ""
 msgid "Method not specified when calling vendor extension."
 msgstr ""
 
-#: ironic/drivers/utils.py:202
+#: ironic/drivers/utils.py:206
 #, python-format
 msgid "Invalid boot_mode parameter '%s'."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:129
+#: ironic/drivers/modules/agent.py:132
 #: ironic/drivers/modules/iscsi_deploy.py:262
 #, python-format
 msgid ""
@@ -825,45 +832,45 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:230
+#: ironic/drivers/modules/agent.py:233
 #, python-format
 msgid "Node %s failed to validate deploy image info"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:359 ironic/drivers/modules/agent.py:372
+#: ironic/drivers/modules/agent.py:362 ironic/drivers/modules/agent.py:375
 #, python-format
 msgid "No handler for method %s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:410
+#: ironic/drivers/modules/agent.py:423
 msgid "Node failed to get image for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:414
+#: ironic/drivers/modules/agent.py:427
 msgid "Node failed to move to active state."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:460
+#: ironic/drivers/modules/agent.py:473
 #, python-format
 msgid "node %(node)s command status errored: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:516
+#: ironic/drivers/modules/agent.py:529
 #, python-format
 msgid "Unknown lookup payloadversion: %s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:548
+#: ironic/drivers/modules/agent.py:561
 #, python-format
 msgid "Malformed network interfaces lookup: %s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:576
+#: ironic/drivers/modules/agent.py:589
 #, python-format
 msgid "No ports matching the given MAC addresses %sexist in the database."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:620
+#: ironic/drivers/modules/agent.py:633
 #, python-format
 msgid ""
 "Ports matching mac addresses match multiple nodes. MACs: %(macs)s. Port "
@@ -949,7 +956,8 @@ msgstr ""
 
 #: ironic/drivers/modules/fake.py:181 ironic/drivers/modules/ipminative.py:404
 #: ironic/drivers/modules/ipmitool.py:694
-#: ironic/drivers/modules/seamicro.py:541 ironic/drivers/modules/ssh.py:643
+#: ironic/drivers/modules/seamicro.py:541 ironic/drivers/modules/ssh.py:635
+#: ironic/drivers/modules/ilo/deploy.py:472
 #, python-format
 msgid "Invalid boot device %s specified."
 msgstr ""
@@ -995,7 +1003,7 @@ msgid ""
 msgstr ""
 
 #: ironic/drivers/modules/iboot.py:188 ironic/drivers/modules/ipmitool.py:613
-#: ironic/drivers/modules/snmp.py:634 ironic/drivers/modules/ssh.py:558
+#: ironic/drivers/modules/snmp.py:647 ironic/drivers/modules/ssh.py:550
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -1182,32 +1190,32 @@ msgstr ""
 msgid "Failure in deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:309 ironic/drivers/modules/pxe.py:488
-#: ironic/drivers/modules/ilo/deploy.py:536
+#: ironic/drivers/modules/iscsi_deploy.py:309 ironic/drivers/modules/pxe.py:487
+#: ironic/drivers/modules/ilo/deploy.py:568
 msgid "Failed to continue iSCSI deployment."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:368
+#: ironic/drivers/modules/iscsi_deploy.py:367
 #, python-format
 msgid "Failed to connect to Glance to get the properties of the image %s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:372
+#: ironic/drivers/modules/iscsi_deploy.py:371
 #, python-format
 msgid "Image %s not found in Glance"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:382
+#: ironic/drivers/modules/iscsi_deploy.py:381
 #, python-format
 msgid "Image %(image)s is missing the following properties: %(properties)s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:399 ironic/drivers/modules/ssh.py:505
+#: ironic/drivers/modules/iscsi_deploy.py:398 ironic/drivers/modules/ssh.py:497
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:408
+#: ironic/drivers/modules/iscsi_deploy.py:407
 msgid ""
 "Couldn't get the URL of the Ironic API service from the configuration "
 "file or keystone catalog."
@@ -1225,18 +1233,18 @@ msgstr ""
 msgid "Cannot validate PXE bootloader"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:283
+#: ironic/drivers/modules/pxe.py:282
 msgid "iPXE boot is enabled but no HTTP URL or HTTP root was specified."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:291
+#: ironic/drivers/modules/pxe.py:290
 #, python-format
 msgid ""
 "Conflict: iPXE is enabled, but cannot be used with node%(node_uuid)s "
 "configured to use UEFI boot"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:445
+#: ironic/drivers/modules/pxe.py:444
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
@@ -1288,69 +1296,69 @@ msgstr ""
 msgid "No volume size provided for creating volume"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:71
+#: ironic/drivers/modules/snmp.py:73
 msgid "PDU manufacturer driver.  Required."
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:72
+#: ironic/drivers/modules/snmp.py:74
 msgid "PDU IPv4 address or hostname.  Required."
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:73
+#: ironic/drivers/modules/snmp.py:75
 msgid "PDU power outlet index (1-based).  Required."
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:76
+#: ironic/drivers/modules/snmp.py:78
 #, python-format
 msgid "SNMP protocol version: %(v1)s, %(v2c)s, %(v3)s  (optional, default %(v1)s)"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:79
+#: ironic/drivers/modules/snmp.py:81
 #, python-format
 msgid "SNMP port, default %(port)d"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:80
+#: ironic/drivers/modules/snmp.py:82
 #, python-format
 msgid "SNMP community.  Required for versions %(v1)s, %(v2c)s"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:83
+#: ironic/drivers/modules/snmp.py:85
 #, python-format
 msgid "SNMP security name.  Required for version %(v3)s"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:509
+#: ironic/drivers/modules/snmp.py:522
 #, python-format
 msgid "SNMP driver requires the following to be set: %s."
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:518
+#: ironic/drivers/modules/snmp.py:531
 #, python-format
 msgid "SNMPPowerDriver: unknown driver: '%s'"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:524
+#: ironic/drivers/modules/snmp.py:537
 #, python-format
 msgid "SNMPPowerDriver: unknown SNMP version: '%s'"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:533
+#: ironic/drivers/modules/snmp.py:546
 #, python-format
 msgid "SNMPPowerDriver: SNMP UDP port must be numeric: %s"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:536
+#: ironic/drivers/modules/snmp.py:549
 #, python-format
 msgid "SNMPPowerDriver: SNMP UDP port out of range: %d"
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:543
+#: ironic/drivers/modules/snmp.py:556
 #, python-format
 msgid "SNMP driver requires snmp_community to be set for version %s."
 msgstr ""
 
-#: ironic/drivers/modules/snmp.py:549
+#: ironic/drivers/modules/snmp.py:562
 #, python-format
 msgid "SNMP driver requires snmp_security to be set for version %s."
 msgstr ""
@@ -1396,32 +1404,32 @@ msgstr ""
 msgid "SSHPowerDriver '%(virt_type)s' is not a valid virt_type."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSHPowerDriver '%(virt_type)s' is not a valid virt_type, "
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:295
+#: ironic/drivers/modules/ssh.py:287
 #, python-format
 msgid "SSHPowerDriver requires the following to be set: %s."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:305
+#: ironic/drivers/modules/ssh.py:297
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:326
+#: ironic/drivers/modules/ssh.py:318
 msgid ""
 "SSHPowerDriver requires one and only one of password, key_contents and "
 "key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ssh.py:327
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:510
+#: ironic/drivers/modules/ssh.py:502
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1545,15 +1553,15 @@ msgstr ""
 msgid "Setting %s as boot mode"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:45
+#: ironic/drivers/modules/ilo/deploy.py:46
 msgid "UUID (from Glance) of the deployment ISO. Required."
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:184
+#: ironic/drivers/modules/ilo/deploy.py:188
 msgid "Error validating iLO virtual media deploy"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:486
+#: ironic/drivers/modules/ilo/deploy.py:518
 #, python-format
 msgid "Unsupported method (%s) passed to iLO driver."
 msgstr ""
@@ -1575,26 +1583,26 @@ msgstr ""
 msgid "Invalid version string"
 msgstr ""
 
-#: ironic/objects/base.py:351
+#: ironic/objects/base.py:349
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
 
-#: ironic/objects/base.py:360
+#: ironic/objects/base.py:358
 msgid "Cannot save anything in the base class"
 msgstr ""
 
-#: ironic/objects/base.py:392
+#: ironic/objects/base.py:390
 #, python-format
 msgid "%(objname)s object has no attribute '%(attrname)s'"
 msgstr ""
 
-#: ironic/objects/base.py:441
+#: ironic/objects/base.py:439
 #, python-format
 msgid "'%(objclass)s' object has no attribute '%(attrname)s'"
 msgstr ""
 
-#: ironic/objects/conductor.py:59
+#: ironic/objects/conductor.py:56
 msgid "Cannot update a conductor record directly."
 msgstr ""