Imported Translations from Transifex

Change-Id: Ifdf358f8ec68b9010195c914409f0d926934052c

1 files changed, 623 insertions, 527 deletions

diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 8c0e56e3e..156a606c2 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nova 2013.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-12-18 00:02+0000\n"
+"POT-Creation-Date: 2012-12-21 00:02+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"
@@ -61,16 +61,20 @@ msgstr ""
 msgid "Subject for certificate for projects, %s for project, timestamp"
 msgstr ""
 
-#: nova/crypto.py:301
+#: nova/crypto.py:302
+msgid "Failed to write inbound.csr"
+msgstr ""
+
+#: nova/crypto.py:305
 #, python-format
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:56
+#: nova/exception.py:66
 msgid "Unexpected error while running command."
 msgstr ""
 
-#: nova/exception.py:59
+#: nova/exception.py:69
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -80,244 +84,240 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: nova/exception.py:72
-msgid "DB exception wrapped."
-msgstr ""
-
-#: nova/exception.py:129
+#: nova/exception.py:126
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:150 nova/openstack/common/rpc/common.py:47
+#: nova/exception.py:147 nova/openstack/common/rpc/common.py:47
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:160
+#: nova/exception.py:161
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:177
+#: nova/exception.py:185
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:181
+#: nova/exception.py:189
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:193
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:198
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:195
+#: nova/exception.py:203
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:200
+#: nova/exception.py:208
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:204
+#: nova/exception.py:212
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:208
+#: nova/exception.py:216
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:220
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:224
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:225 nova/api/ec2/cloud.py:436 nova/api/ec2/cloud.py:461
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2307
+#: nova/exception.py:233 nova/api/ec2/cloud.py:436 nova/api/ec2/cloud.py:461
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2312
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:237
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:241
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:245
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:241 nova/api/openstack/compute/servers.py:1309
+#: nova/exception.py:249 nova/api/openstack/compute/servers.py:1309
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:253
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:257
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:253 nova/api/ec2/cloud.py:618
+#: nova/exception.py:261 nova/api/ec2/cloud.py:618
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:273
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:272
+#: nova/exception.py:280
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:276
+#: nova/exception.py:284
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:289
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:293
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:297
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:302
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:298
+#: nova/exception.py:306
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:306
+#: nova/exception.py:314
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:318
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:322
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:326
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:330
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:334
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:338
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:347
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:351
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:356
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:353
+#: nova/exception.py:361
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:365
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:369
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:365
+#: nova/exception.py:373
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,80 +325,80 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:386
+#: nova/exception.py:394
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:398
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:402
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:419
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:424
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:428
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:432
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:436
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:448
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:452
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:456
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -406,693 +406,688 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:455
+#: nova/exception.py:463
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:479
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:483
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:487
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:491
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:495
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:499
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:503
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:507
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:504
+#: nova/exception.py:512
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:508
+#: nova/exception.py:516
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:512
+#: nova/exception.py:520
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:516
+#: nova/exception.py:524
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:520
+#: nova/exception.py:528
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:524
+#: nova/exception.py:532
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:528
+#: nova/exception.py:536
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:550
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:547
+#: nova/exception.py:555
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:552
+#: nova/exception.py:560
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:556
+#: nova/exception.py:564
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:560
+#: nova/exception.py:568
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:569
+#: nova/exception.py:577
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:573
+#: nova/exception.py:581
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:577
+#: nova/exception.py:585
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:581
+#: nova/exception.py:589
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:585
+#: nova/exception.py:593
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:589
+#: nova/exception.py:597
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:593
+#: nova/exception.py:601
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:598
+#: nova/exception.py:606
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:611
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:615
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:611
+#: nova/exception.py:619
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:623
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:627
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:631
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:635
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:639
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:643
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:647
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:651
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:647
+#: nova/exception.py:655
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:651
+#: nova/exception.py:659
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:701
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:705
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:710
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:707
+#: nova/exception.py:715
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:719
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:716
+#: nova/exception.py:724
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:728
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:734
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:738
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:742
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:747
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:751
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:755
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:752
+#: nova/exception.py:760
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:764
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:761
+#: nova/exception.py:769
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:773
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:769
+#: nova/exception.py:777
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:782
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:778
+#: nova/exception.py:786
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:791
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:801
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:805
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:809
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:814
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:818
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:814
+#: nova/exception.py:822
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:818
+#: nova/exception.py:826
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:822
+#: nova/exception.py:830
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:826
+#: nova/exception.py:834
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:830
+#: nova/exception.py:838
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:834
+#: nova/exception.py:842
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:838
+#: nova/exception.py:846
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:850
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:855
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:851
+#: nova/exception.py:859
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:855
+#: nova/exception.py:863
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:859
+#: nova/exception.py:867
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:873
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:877
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:881
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:885
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:889
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:893
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:897
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:901
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:905
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:909
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:905
-#, python-format
-msgid "Host %(host)s is not up or doesn't exist."
-msgstr ""
-
-#: nova/exception.py:909
+#: nova/exception.py:913
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:916
+#: nova/exception.py:920
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:925
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:929
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:929
+#: nova/exception.py:933
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:933
+#: nova/exception.py:937
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:937
+#: nova/exception.py:941
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:941
+#: nova/exception.py:945
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:945
+#: nova/exception.py:949
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:949
+#: nova/exception.py:953
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:958
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:962
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:966
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:970
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:975
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:983
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:989
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:993
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:997
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1001
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:1005
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1009
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1013
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1017
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1021
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1022
+#: nova/exception.py:1026
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1027
+#: nova/exception.py:1031
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1037
+#: nova/exception.py:1041
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1220,7 +1215,7 @@ msgstr ""
 
 #: nova/service.py:392
 #, python-format
-msgid "Starting %(topic)s node (version %(vcs_string)s)"
+msgid "Starting %(topic)s node (version %(version)s)"
 msgstr ""
 
 #: nova/service.py:409 nova/openstack/common/rpc/service.py:47
@@ -1323,7 +1318,7 @@ msgstr ""
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1116 nova/virt/configdrive.py:160
+#: nova/utils.py:1116 nova/virt/configdrive.py:165
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1358,7 +1353,7 @@ msgstr ""
 msgid "Sourcing roles from deprecated X-Role HTTP header"
 msgstr ""
 
-#: nova/api/sizelimit.py:50
+#: nova/api/sizelimit.py:50 nova/api/metadata/password.py:37
 msgid "Request is too large."
 msgstr ""
 
@@ -1494,8 +1489,8 @@ msgstr ""
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:553 nova/api/metadata/handler.py:135
-#: nova/api/metadata/handler.py:182
+#: nova/api/ec2/__init__.py:553 nova/api/metadata/handler.py:138
+#: nova/api/metadata/handler.py:185
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1757,20 +1752,20 @@ msgid ""
 "header."
 msgstr ""
 
-#: nova/api/metadata/handler.py:133 nova/api/metadata/handler.py:140
+#: nova/api/metadata/handler.py:136 nova/api/metadata/handler.py:143
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:152
+#: nova/api/metadata/handler.py:155
 msgid "X-Instance-ID header is missing from request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:154
+#: nova/api/metadata/handler.py:157
 msgid "Multiple X-Instance-ID headers found within request."
 msgstr ""
 
-#: nova/api/metadata/handler.py:168
+#: nova/api/metadata/handler.py:171
 #, python-format
 msgid ""
 "X-Instance-ID-Signature: %(signature)s does not match the expected value:"
@@ -1778,11 +1773,11 @@ msgid ""
 "%(remote_address)s"
 msgstr ""
 
-#: nova/api/metadata/handler.py:173
+#: nova/api/metadata/handler.py:176
 msgid "Invalid proxy request signature."
 msgstr ""
 
-#: nova/api/metadata/handler.py:180 nova/api/metadata/handler.py:187
+#: nova/api/metadata/handler.py:183 nova/api/metadata/handler.py:190
 #, python-format
 msgid "Failed to get metadata for instance id: %s"
 msgstr ""
@@ -2313,9 +2308,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1200
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:218
+#: nova/api/openstack/compute/contrib/coverage_ext.py:227
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/contrib/networks.py:72
 msgid "Invalid request body"
 msgstr ""
 
@@ -2497,12 +2491,17 @@ msgstr ""
 msgid "Unable to get console"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:85
+#: nova/api/openstack/compute/contrib/coverage_ext.py:91
+#, python-format
+msgid "Can't connect to service: %s, no portspecified\n"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/coverage_ext.py:94
 #, python-format
 msgid "No backdoor API command for service: %s\n"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:225
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2687,59 +2686,67 @@ msgstr ""
 msgid "Unable to find address %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:69
-#, python-format
-msgid "Network does not have %s action"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/networks.py:77
+#: nova/api/openstack/compute/contrib/networks.py:73
 #, python-format
 msgid "Disassociating network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:81
+#: nova/api/openstack/compute/contrib/networks.py:78
+#: nova/api/openstack/compute/contrib/networks.py:88
 #: nova/api/openstack/compute/contrib/networks.py:98
-#: nova/api/openstack/compute/contrib/networks.py:108
+#: nova/api/openstack/compute/contrib/networks_associate.py:29
+#: nova/api/openstack/compute/contrib/networks_associate.py:40
+#: nova/api/openstack/compute/contrib/networks_associate.py:52
 msgid "Network not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:94
+#: nova/api/openstack/compute/contrib/networks.py:84
 #, python-format
 msgid "Showing network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:104
+#: nova/api/openstack/compute/contrib/networks.py:94
 #, python-format
 msgid "Deleting network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:119
+#: nova/api/openstack/compute/contrib/networks.py:109
 msgid "Missing network in body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:123
+#: nova/api/openstack/compute/contrib/networks.py:113
 msgid "Network label is required"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:127
+#: nova/api/openstack/compute/contrib/networks.py:117
 msgid "Network cidr or cidr_v6 is required"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:129
+#: nova/api/openstack/compute/contrib/networks.py:119
 #, python-format
 msgid "Creating network with label %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:145
+#: nova/api/openstack/compute/contrib/networks.py:135
 #, python-format
 msgid "Associating network %(network)s with project %(project)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:153
+#: nova/api/openstack/compute/contrib/networks.py:143
 #, python-format
 msgid "Cannot associate network %(network)s with project %(project)s: %(message)s"
 msgstr ""
 
+#: nova/api/openstack/compute/contrib/networks_associate.py:25
+#, python-format
+msgid "Disassociating host with network with id %s"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/networks_associate.py:36
+#, python-format
+msgid "Disassociating project with network with id %s"
+msgstr ""
+
 #: nova/api/openstack/compute/contrib/quotas.py:63
 msgid "Quota limit must be -1 or greater."
 msgstr ""
@@ -2846,200 +2853,200 @@ msgstr ""
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: nova/compute/api.py:252
+#: nova/compute/api.py:257
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:259
+#: nova/compute/api.py:264
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:273
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:288
+#: nova/compute/api.py:293
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:298
+#: nova/compute/api.py:303
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:302
+#: nova/compute/api.py:307
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:306
+#: nova/compute/api.py:311
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:538
+#: nova/compute/api.py:543
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:610
+#: nova/compute/api.py:615
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:637
+#: nova/compute/api.py:642
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:873
+#: nova/compute/api.py:878
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:968
+#: nova/compute/api.py:973
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1012
+#: nova/compute/api.py:1017
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1034
+#: nova/compute/api.py:1039
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1081
+#: nova/compute/api.py:1086
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1095
+#: nova/compute/api.py:1100
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1162
+#: nova/compute/api.py:1167
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1294
+#: nova/compute/api.py:1299
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1403
+#: nova/compute/api.py:1408
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1735
+#: nova/compute/api.py:1740
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1744
+#: nova/compute/api.py:1749
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1786
+#: nova/compute/api.py:1791
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:1962
+#: nova/compute/api.py:1967
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1970
+#: nova/compute/api.py:1975
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2038
+#: nova/compute/api.py:2043
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2123
+#: nova/compute/api.py:2128
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2280
+#: nova/compute/api.py:2285
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2284
+#: nova/compute/api.py:2289
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2385
+#: nova/compute/api.py:2390
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2393
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2396
+#: nova/compute/api.py:2401
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2402
+#: nova/compute/api.py:2407
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2422
+#: nova/compute/api.py:2427
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2425
+#: nova/compute/api.py:2430
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2432
+#: nova/compute/api.py:2437
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2497
+#: nova/compute/api.py:2502
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2505
+#: nova/compute/api.py:2510
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2508
+#: nova/compute/api.py:2513
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2765
+#: nova/compute/api.py:2770
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2774
+#: nova/compute/api.py:2779
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2777
+#: nova/compute/api.py:2782
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2788
+#: nova/compute/api.py:2793
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
@@ -3273,7 +3280,7 @@ msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
 #: nova/compute/manager.py:1083 nova/compute/manager.py:2045
-#: nova/compute/manager.py:3341
+#: nova/compute/manager.py:3371
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
@@ -3476,162 +3483,162 @@ msgstr ""
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2519
+#: nova/compute/manager.py:2532
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2579
+#: nova/compute/manager.py:2593
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2605
+#: nova/compute/manager.py:2621
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2654
+#: nova/compute/manager.py:2674
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2656
+#: nova/compute/manager.py:2676
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
 
-#: nova/compute/manager.py:2670
+#: nova/compute/manager.py:2690
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2804
+#: nova/compute/manager.py:2834
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2848
+#: nova/compute/manager.py:2878
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2854
+#: nova/compute/manager.py:2884
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2863
+#: nova/compute/manager.py:2893
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2870
+#: nova/compute/manager.py:2900
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2904
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2881
+#: nova/compute/manager.py:2911
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2889
+#: nova/compute/manager.py:2919
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2906
+#: nova/compute/manager.py:2936
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:2924
+#: nova/compute/manager.py:2954
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2947
+#: nova/compute/manager.py:2977
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3060
+#: nova/compute/manager.py:3090
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3078
+#: nova/compute/manager.py:3108
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3106
+#: nova/compute/manager.py:3136
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3112 nova/compute/manager.py:3150
+#: nova/compute/manager.py:3142 nova/compute/manager.py:3180
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3137
+#: nova/compute/manager.py:3167
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3173
+#: nova/compute/manager.py:3203
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3185 nova/compute/manager.py:3196
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3215 nova/compute/manager.py:3226
+#: nova/compute/manager.py:3240
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3220
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3203
+#: nova/compute/manager.py:3233
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3219
+#: nova/compute/manager.py:3249
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3227
+#: nova/compute/manager.py:3257
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:3240
+#: nova/compute/manager.py:3270
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:3295
+#: nova/compute/manager.py:3325
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:3302
+#: nova/compute/manager.py:3332
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:3309
+#: nova/compute/manager.py:3339
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
@@ -3817,7 +3824,7 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2740
+#: nova/db/sqlalchemy/api.py:2745
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
@@ -3832,16 +3839,20 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:299
+#: nova/db/sqlalchemy/session.py:321
+msgid "DB exception wrapped."
+msgstr ""
+
+#: nova/db/sqlalchemy/session.py:378
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:340
+#: nova/db/sqlalchemy/session.py:419
 msgid "Using mysql/eventlet db_pool."
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:384
+#: nova/db/sqlalchemy/session.py:463
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
@@ -3941,11 +3952,20 @@ msgstr ""
 msgid "kwargs: %s"
 msgstr ""
 
-#: nova/network/api.py:170
+#: nova/network/api.py:172
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
 
+#: nova/network/driver.py:39
+msgid "Network driver option required, but not specified"
+msgstr ""
+
+#: nova/network/driver.py:42
+#, python-format
+msgid "Loading network driver '%s'"
+msgstr ""
+
 #: nova/network/ldapdns.py:98
 #, python-format
 msgid ""
@@ -3983,168 +4003,168 @@ msgid ""
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:385
+#: nova/network/linux_net.py:387
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:591
+#: nova/network/linux_net.py:593
 #, python-format
 msgid "arping error for ip %s"
 msgstr ""
 
-#: nova/network/linux_net.py:829
+#: nova/network/linux_net.py:849
 #, python-format
 msgid "Pid %d is stale, skip killing dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:870
+#: nova/network/linux_net.py:894
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:872
+#: nova/network/linux_net.py:896
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:937
+#: nova/network/linux_net.py:961
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:939
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:1076
+#: nova/network/linux_net.py:1100
 #, python-format
 msgid "Error clearing stale veth %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1199
+#: nova/network/linux_net.py:1223
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1230
+#: nova/network/linux_net.py:1254
 #, python-format
 msgid "Failed unplugging VLAN interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1233
+#: nova/network/linux_net.py:1257
 #, python-format
 msgid "Unplugged VLAN interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1255
+#: nova/network/linux_net.py:1279
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1267
+#: nova/network/linux_net.py:1291
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1300
+#: nova/network/linux_net.py:1324
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1340
+#: nova/network/linux_net.py:1364
 #, python-format
 msgid "Failed unplugging bridge interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1343
+#: nova/network/linux_net.py:1367
 #, python-format
 msgid "Unplugged bridge interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1498
+#: nova/network/linux_net.py:1522
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1506
+#: nova/network/linux_net.py:1530
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1525
+#: nova/network/linux_net.py:1549
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1527
+#: nova/network/linux_net.py:1551
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:314
+#: nova/network/manager.py:320
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:323 nova/network/manager.py:585
+#: nova/network/manager.py:329 nova/network/manager.py:591
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:338
+#: nova/network/manager.py:344
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:402
+#: nova/network/manager.py:408
 msgid "Floating IP is not associated. Ignore."
 msgstr ""
 
-#: nova/network/manager.py:420
+#: nova/network/manager.py:426
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:424
+#: nova/network/manager.py:430
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:445
+#: nova/network/manager.py:451
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
 msgstr ""
 
-#: nova/network/manager.py:507
+#: nova/network/manager.py:513
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:722
 #, python-format
 msgid "Starting migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/manager.py:723
+#: nova/network/manager.py:729
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notmigrate it "
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:759
 #, python-format
 msgid "Finishing migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/manager.py:761
+#: nova/network/manager.py:767
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notsetup it."
 msgstr ""
 
-#: nova/network/manager.py:808
+#: nova/network/manager.py:814
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4152,39 +4172,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:854
+#: nova/network/manager.py:860
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:864
+#: nova/network/manager.py:870
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:982
+#: nova/network/manager.py:986
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:986
+#: nova/network/manager.py:990
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:1113
+#: nova/network/manager.py:1117
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1122
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:1154
+#: nova/network/manager.py:1158
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1384
+#: nova/network/manager.py:1388
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4192,89 +4212,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1472
+#: nova/network/manager.py:1476
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1491
+#: nova/network/manager.py:1495
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1499
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1503
+#: nova/network/manager.py:1507
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1508
+#: nova/network/manager.py:1512
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1512
+#: nova/network/manager.py:1516
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1515
+#: nova/network/manager.py:1519
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1534
+#: nova/network/manager.py:1538
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1558
+#: nova/network/manager.py:1562
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1578
+#: nova/network/manager.py:1582
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1659
+#: nova/network/manager.py:1663
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1662
+#: nova/network/manager.py:1666
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1673
+#: nova/network/manager.py:1677
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1730
+#: nova/network/manager.py:1734
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1750
+#: nova/network/manager.py:1754
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2243
+#: nova/network/manager.py:2268
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2250
+#: nova/network/manager.py:2275
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4308,20 +4328,6 @@ msgstr ""
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/network/quantum/nova_ipam_lib.py:71
-msgid "Error creating network entry"
-msgstr ""
-
-#: nova/network/quantum/nova_ipam_lib.py:86
-#, python-format
-msgid "No network with net_id = %s"
-msgstr ""
-
-#: nova/network/quantum/nova_ipam_lib.py:252
-#, python-format
-msgid "No fixed IPs to deallocate for vif %s"
-msgstr ""
-
 #: nova/network/quantumv2/__init__.py:41
 msgid "_get_auth_token() failed"
 msgstr ""
@@ -5071,31 +5077,31 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fake_volume.py:182 nova/volume/cinder.py:158
+#: nova/tests/fake_volume.py:182 nova/volume/cinder.py:175
 msgid "status must be available"
 msgstr ""
 
-#: nova/tests/fake_volume.py:186 nova/volume/cinder.py:161
+#: nova/tests/fake_volume.py:186 nova/volume/cinder.py:178
 msgid "already attached"
 msgstr ""
 
-#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:167
+#: nova/tests/fake_volume.py:191 nova/volume/cinder.py:184
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:849
+#: nova/tests/fakelibvirt.py:852
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:853
+#: nova/tests/fakelibvirt.py:856
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:857
+#: nova/tests/fakelibvirt.py:860
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:861
+#: nova/tests/fakelibvirt.py:864
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5229,33 +5235,33 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:666
-#: nova/tests/compute/test_compute.py:717
-#: nova/tests/compute/test_compute.py:742
-#: nova/tests/compute/test_compute.py:2536
+#: nova/tests/compute/test_compute.py:649
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:718
+#: nova/tests/compute/test_compute.py:743
+#: nova/tests/compute/test_compute.py:2592
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:654
-#: nova/tests/compute/test_compute.py:689
-#: nova/tests/compute/test_compute.py:730
-#: nova/tests/compute/test_compute.py:760
+#: nova/tests/compute/test_compute.py:655
+#: nova/tests/compute/test_compute.py:690
+#: nova/tests/compute/test_compute.py:731
+#: nova/tests/compute/test_compute.py:761
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1179
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2547
+#: nova/tests/compute/test_compute.py:2603
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3016
+#: nova/tests/compute/test_compute.py:3072
 msgid "wrong host/node"
 msgstr ""
 
@@ -5296,12 +5302,12 @@ msgid ""
 "arguments \"%(params)s\""
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:150
+#: nova/tests/integrated/test_api_samples.py:151
 #, python-format
 msgid "Result: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:154
+#: nova/tests/integrated/test_api_samples.py:155
 #, python-format
 msgid ""
 "Key mismatch:\n"
@@ -5309,25 +5315,25 @@ msgid ""
 "%(res_keys)s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:162
+#: nova/tests/integrated/test_api_samples.py:163
 #, python-format
 msgid "Result: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:165
+#: nova/tests/integrated/test_api_samples.py:166
 #, python-format
 msgid ""
 "Length mismatch: %(result)s\n"
 "%(expected)s."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:176
+#: nova/tests/integrated/test_api_samples.py:177
 #, python-format
 msgid "Result: %(res_obj)s not in %(expected)s."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:194
-#: nova/tests/integrated/test_api_samples.py:207
+#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:208
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -5394,16 +5400,16 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:796
+#: nova/virt/driver.py:798
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:799
+#: nova/virt/driver.py:801
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:806
+#: nova/virt/driver.py:808
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
@@ -5453,6 +5459,86 @@ msgstr ""
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
+#: nova/virt/baremetal/driver.py:86
+#, python-format
+msgid "Request for baremetal node %s sent to wrong service host"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:136
+msgid "cpu_arch is not found in instance_type_extra_specs"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:175
+msgid "Baremetal node id not supplied to driver"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:179
+#, python-format
+msgid "Baremetal node %s already in use"
+msgstr ""
+
+#: nova/virt/baremetal/driver.py:241
+#, python-format
+msgid "Delete called on non-existing instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/utils.py:37
+#, python-format
+msgid "failed to unlink %s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:37
+#, python-format
+msgid "plug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:50
+#, python-format
+msgid "pif:%(id)s is plugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:57
+#, python-format
+msgid ""
+"Baremetal node: %(id)s has no available physical interface for virtual "
+"interface %(vif_uuid)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:63
+#, python-format
+msgid "unplug: instance_uuid=%(uuid)s vif=%(vif)s"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:71
+#, python-format
+msgid "pif:%(id)s is unplugged (vif_uuid=%(vif_uuid)s)"
+msgstr ""
+
+#: nova/virt/baremetal/vif_driver.py:75
+#, python-format
+msgid "no pif for vif_uuid=%s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:128
+#, python-format
+msgid "baremetal driver was unable to delete tid %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:192
+#, python-format
+msgid "Could not determine iscsi initiator name for instance %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:234
+#, python-format
+msgid "No fixed PXE IP is associated to %s"
+msgstr ""
+
+#: nova/virt/baremetal/volume_driver.py:267
+#, python-format
+msgid "detach volume could not find tid for %s"
+msgstr ""
+
 #: nova/virt/baremetal/db/sqlalchemy/api.py:260
 msgid "No more PXE IPs available"
 msgstr ""
@@ -5536,71 +5622,79 @@ msgstr ""
 msgid "User %(username)s not found in shadow file."
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:38
+#: nova/virt/disk/mount/api.py:41
 #, python-format
 msgid ""
 "Instance for format imgfile=%(imgfile)s mountdir=%(mountdir)s "
 "partition=%(partition)s imgfmt=%(imgfmt)s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:42 nova/virt/disk/mount/api.py:58
+#: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
 #: nova/virt/disk/vfs/localfs.py:67
 msgid "Using LoopMount"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:47 nova/virt/disk/mount/api.py:63
+#: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
 #: nova/virt/disk/vfs/localfs.py:72
 msgid "Using NbdMount"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:54
+#: nova/virt/disk/mount/api.py:57
 #, python-format
 msgid ""
 "Instance for device imgfile=%(imgfile)s mountdir=%(mountdir)s "
 "partition=%(partition)s device=%(device)s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:112
+#: nova/virt/disk/mount/api.py:117
+msgid "Device allocation failed. Will retry in 2 seconds."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:120
+msgid "Device allocation failed after repeated retries."
+msgstr ""
+
+#: nova/virt/disk/mount/api.py:135
 #, python-format
 msgid "Map dev %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:117
+#: nova/virt/disk/mount/api.py:140
 #, python-format
 msgid "partition search unsupported with %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:133
+#: nova/virt/disk/mount/api.py:156
 #, python-format
 msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:134
+#: nova/virt/disk/mount/api.py:157
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:156
+#: nova/virt/disk/mount/api.py:179
 #, python-format
 msgid "Unmap dev %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:164
+#: nova/virt/disk/mount/api.py:187
 #, python-format
 msgid "Mount %(dev)s on %(dir)s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:169
+#: nova/virt/disk/mount/api.py:192
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:179
+#: nova/virt/disk/mount/api.py:202
 #, python-format
 msgid "Umount %s"
 msgstr ""
 
-#: nova/virt/disk/mount/api.py:190
+#: nova/virt/disk/mount/api.py:213
 msgid "Fail to mount, tearing back down"
 msgstr ""
 
@@ -5609,57 +5703,59 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount/loop.py:37
+#: nova/virt/disk/mount/loop.py:34
+#, python-format
+msgid "Loop mount error: %s"
+msgstr ""
+
+#: nova/virt/disk/mount/loop.py:40
 #, python-format
 msgid "Got loop device %s"
 msgstr ""
 
-#: nova/virt/disk/mount/loop.py:44
+#: nova/virt/disk/mount/loop.py:58
 #, python-format
 msgid "Release loop device %s"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:55 nova/virt/disk/mount/nbd.py:69
+#: nova/virt/disk/mount/nbd.py:54 nova/virt/disk/mount/nbd.py:68
 msgid "No free nbd devices"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:60
+#: nova/virt/disk/mount/nbd.py:59
 msgid "ndb module not loaded"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:61
+#: nova/virt/disk/mount/nbd.py:60
 msgid "nbd unavailable: module not loaded"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:86
+#: nova/virt/disk/mount/nbd.py:85
 #, python-format
 msgid "Get nbd device %(dev)s for %(imgfile)s"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:91
+#: nova/virt/disk/mount/nbd.py:90
 #, python-format
 msgid "qemu-nbd error: %s"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:106
+#: nova/virt/disk/mount/nbd.py:91 nova/virt/disk/mount/nbd.py:104
 #, python-format
-msgid "Detaching from erroneous nbd device returned error: %s"
+msgid "NBD mount error: %s"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:108
+#: nova/virt/disk/mount/nbd.py:103
 #, python-format
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:120
-msgid "nbd device allocation failed. Will retry in 2 seconds."
-msgstr ""
-
-#: nova/virt/disk/mount/nbd.py:124
-msgid "nbd device allocation failed after repeated retries."
+#: nova/virt/disk/mount/nbd.py:110
+#, python-format
+msgid "Detaching from erroneous nbd device returned error: %s"
 msgstr ""
 
-#: nova/virt/disk/mount/nbd.py:133
+#: nova/virt/disk/mount/nbd.py:125
 #, python-format
 msgid "Release nbd device %s"
 msgstr ""
@@ -5826,7 +5922,7 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/basevolumeutils.py:79 nova/virt/libvirt/driver.py:1503
+#: nova/virt/hyperv/basevolumeutils.py:79 nova/virt/libvirt/driver.py:1509
 #: nova/virt/xenapi/vm_utils.py:504
 #, python-format
 msgid "block_device_list %s"
@@ -5875,7 +5971,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3096
+#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3164
 #: nova/virt/xenapi/host.py:150
 msgid "Updating host stats"
 msgstr ""
@@ -6059,16 +6155,16 @@ msgstr ""
 msgid "Invalid config_drive_format \"%s\""
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:183 nova/virt/libvirt/driver.py:1436
+#: nova/virt/hyperv/vmops.py:183 nova/virt/libvirt/driver.py:1442
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:194 nova/virt/libvirt/driver.py:1446
+#: nova/virt/hyperv/vmops.py:194 nova/virt/libvirt/driver.py:1452
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:201 nova/virt/libvirt/driver.py:1451
+#: nova/virt/hyperv/vmops.py:201 nova/virt/libvirt/driver.py:1457
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -6320,7 +6416,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:228 nova/virt/libvirt/driver.py:623
+#: nova/virt/hyperv/volumeops.py:228 nova/virt/libvirt/driver.py:629
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6434,239 +6530,239 @@ msgstr ""
 msgid "An error has occurred when calling the iscsi initiator: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:341
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:346
+#: nova/virt/libvirt/driver.py:347
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:367
+#: nova/virt/libvirt/driver.py:368
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:389 nova/virt/libvirt/driver.py:392
+#: nova/virt/libvirt/driver.py:390 nova/virt/libvirt/driver.py:393
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:410
+#: nova/virt/libvirt/driver.py:411
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:486
+#: nova/virt/libvirt/driver.py:492
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:500
+#: nova/virt/libvirt/driver.py:506
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:505
+#: nova/virt/libvirt/driver.py:511
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:527
+#: nova/virt/libvirt/driver.py:533
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:542
+#: nova/virt/libvirt/driver.py:548
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:555
+#: nova/virt/libvirt/driver.py:561
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:572
+#: nova/virt/libvirt/driver.py:578
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:586
+#: nova/virt/libvirt/driver.py:592
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:746
+#: nova/virt/libvirt/driver.py:752
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:756
+#: nova/virt/libvirt/driver.py:762
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:776
+#: nova/virt/libvirt/driver.py:782
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:908
+#: nova/virt/libvirt/driver.py:914
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:912
+#: nova/virt/libvirt/driver.py:918
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:944
+#: nova/virt/libvirt/driver.py:950
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:980
+#: nova/virt/libvirt/driver.py:986
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1108
+#: nova/virt/libvirt/driver.py:1114
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1115 nova/virt/powervm/operator.py:255
+#: nova/virt/libvirt/driver.py:1121 nova/virt/powervm/operator.py:255
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1131
+#: nova/virt/libvirt/driver.py:1137
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1169 nova/virt/libvirt/driver.py:1195
+#: nova/virt/libvirt/driver.py:1175 nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1184
+#: nova/virt/libvirt/driver.py:1190
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1233
+#: nova/virt/libvirt/driver.py:1239
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1237
+#: nova/virt/libvirt/driver.py:1243
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1241 nova/virt/libvirt/driver.py:1245
+#: nova/virt/libvirt/driver.py:1247 nova/virt/libvirt/driver.py:1251
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1311
+#: nova/virt/libvirt/driver.py:1317
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1466
+#: nova/virt/libvirt/driver.py:1472
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1476
+#: nova/virt/libvirt/driver.py:1482
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1550
+#: nova/virt/libvirt/driver.py:1561
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1556
+#: nova/virt/libvirt/driver.py:1567
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1560
+#: nova/virt/libvirt/driver.py:1571
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1564
+#: nova/virt/libvirt/driver.py:1575
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1580
+#: nova/virt/libvirt/driver.py:1591
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1871
+#: nova/virt/libvirt/driver.py:1900
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1875
+#: nova/virt/libvirt/driver.py:1904
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1892
+#: nova/virt/libvirt/driver.py:1921
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2024
+#: nova/virt/libvirt/driver.py:2053
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2141
+#: nova/virt/libvirt/driver.py:2170
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2224
+#: nova/virt/libvirt/driver.py:2253
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2248
+#: nova/virt/libvirt/driver.py:2277
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2252
+#: nova/virt/libvirt/driver.py:2281
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2367
+#: nova/virt/libvirt/driver.py:2397
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2375
+#: nova/virt/libvirt/driver.py:2405
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2410
+#: nova/virt/libvirt/driver.py:2442
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2435
+#: nova/virt/libvirt/driver.py:2467
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2447
+#: nova/virt/libvirt/driver.py:2479
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6676,51 +6772,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2464
+#: nova/virt/libvirt/driver.py:2496
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2512
+#: nova/virt/libvirt/driver.py:2544
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2582
+#: nova/virt/libvirt/driver.py:2616
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2706
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2821
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2802
+#: nova/virt/libvirt/driver.py:2870
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2851
+#: nova/virt/libvirt/driver.py:2919
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2910
+#: nova/virt/libvirt/driver.py:2978
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2917
+#: nova/virt/libvirt/driver.py:2985
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2968
+#: nova/virt/libvirt/driver.py:3036
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -8681,7 +8777,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/cinder.py:67
+#: nova/volume/cinder.py:69
 #, python-format
 msgid "Cinderclient connection created using URL: %s"
 msgstr ""